Skip to content

Commit 5ceb8a8

Browse files
EricWittmannalesjcarlesarnalfamartingFabian Martinez
authored
Merging all of the work from feat/artifact-groups!! (#1265)
* JAX-RS generated classes for v2 of the Registry API. * Lots of refactoring to start implementing v2 of the rest api * JAX-RS generated classes for v2 of the Registry API. * Added groupId concept to the storage layer * JAX-RS generated classes for v2 of the Registry API. * Update ArtifactgroupsResource.java * Update ArtifactMetaData.java * Update EditableMetaData.java * Update SearchedVersion.java * Update VersionMetaData.java * Updated the REST API with some recent changes * Handle serializer cache, simplify Streams storage (#1163) * GlobalId Strategy should seed the Schema cache if it registers a schema #1148 * Simplify Streams storage, no need for async global id mapping. * Updated the asyncmem storage * JAX-RS generated classes for v2 of the Registry API. * Regenerated the jax-rs layer after modifications to the v2 api design * JAX-RS generated classes for v2 of the Registry API. * Additional changes to the v2 REST api * added jax-rs test for the /groups v2 api endpoint * V2 api auth support (#1172) * Add security paths for v2 api endpoints * Remove localhost placeholder * Simplify permission paths * Fixed a failing unit test * Added a test for multiple groups. * JAX-RS generated classes for v2 of the Registry API. * Added more tests and updated the in-memory storage to support contentId and contentHash * JAX-RS generated classes for v2 of the Registry API. * Implemented the /ids API endpoints and created tests for them * minor change to the auth test and its superclass * updated the asyncmem and ispn storages with latest changes * removed an unused interface in the UI service * Created a search REST test * Stop polluting compatibility layer with REST beans * Added UI support for groups in the Artifacts page and Upload Artifact modal * Added UI support for groups. * Rest client using java 11 http client. (#1195) * Plain java rest client initial implementation * Extract client creation into a factory * Add json body handler * Use json body handler * Use entry set * Extract methods to request handler * SQL storage - artifact groups (#1189) * sql storage - artifact groups * undo unneeded test changes * searchArtifacts by groupId - make exact search * add groupId test * minor code readability changes in the new rest client impl * Implemented the /ids operations in the new rest client * Fix testCorrectGroup test * fixed a test and disabled the auth test when running on windows * Search artifacts and simplified request handler (#1202) * Fix accept and content type headers * Change artifact name * Artifact search * Improve rest client code format * Simplify request handler * Add search versions * Fix list query params * Updated the maven plugins to use the v2 api. Also updated how the mojos are configured * Java 11 rest client 1173 (#1204) * Fix format issues * Add admin resources to rest client (#1206) * Use io utils when dealing with streams * Add artifact rule tests * Add admin resources to rest client * Implement admin resources * Add test comments * Add auth capabilities * Refactor request handler and add initial auth capabilities * Fix empty response expected issue * Add request headers customization capabilities (#1210) * Add request headers customization capability * Improve json error handling (#1211) * v2 api - dynamic log configuration (#1190) * api v2 dynamic log configuration impl * dynamic log configuration: sql storage * Simplify java 11 rest client (#1212) * Fix log operations path and enable tests (#1213) * Fixed a unit test and removed an unused import * fixed the test URL for two mojo tests * New integration-tests + serdes 2.0 (#1218) * serdes refactoring - serdes 2.0 * serde 2.0 - improvements * improve serdes and add serdes QuarkusTests * WIP: integration-tests 2.0 * serdes-2.0 impl improvements * new client bug fixes * new integration-tests * test fixes * fix tests deps in storages * fix sql storage bug * fix loggers tests * fix listArtifactsInGroup offset and limit parameters * disable infinispan tests * build integration tests common * fix legacy tests deps issue * re-implement more integration-tests * fix TestUpdateRegistryMojoTest * Regenerate JAX-RS layer with addition of quarkus annotation on beans (#1223) * removed some usages of "var" instead of specific var types * JAX-RS generated classes for v2 of the Registry API. * Update RuleViolationError.java * CLI - use v2 api client, use quarkus command mode and compile the tool to native (#1219) * Add tls and custom configuration support (#1222) * Add tls and custom configuration support * Fix compilation error in serdes * Fix bad param value * Feat/artifact groups test old serdes release (#1227) * revert #1132 in v1 API for compatibility with old client * legacy-tests test old client version(1.3.2.Final) with v1 api * fix testLoggersCRUD test (#1228) * JAX-RS generated classes for v2 of the Registry API. * Update RuleViolationError.java * Maven build cleanup, removed deprecated v1 client and serdes, disabled connector temporarily * refactor converters to use serdes 2.0 * Uncomment converter and converter distro * updated kafka+sql storage to support groups and log configs * Fixed some bugs in the kafkasql groupId support. * Fix potential mbean registration error in kafkasql * Minor improvements found when updating apicurio-registry-examples * re-organized the API endpoints. Fixes #1238 * Created an API listing page located at /apis - now all supported APIs are documented there * Back to using the client to delete global rules for all tests. Set client to always use HTTP/1 * Adapt auth paths to new api structure (#1255) * Serdes improvements: config classes, protobuf textual schema support, headers handler, more tests, schema resolver api, deserializers, ... (#1256) * separated out schema resolver functionality to provide a nice base class for custom resolvers * Incorrect transitive compatibility checking for JSON schemas. Fixes #1239 (#1257) * compatibility request filter for the old /api/ path (#1258) * Support "default" groupId in v2 to simulate "no group" and provide compatibility with v1 api * Support for "default" groupId in v2 API (#1259) * Support "default" groupId in v2 to simulate "no group" and provide compatibility with v1 api * adapt tests to default groupId Co-authored-by: Fabian Martinez <famartin@redhat.com> * Add artifact groups streams storage 1180 (#1264) * Change artifact id by artifact key * Add artifact key support to streams storage layer * Add artifact key serdes * Partially fix artifacts search * Fix metadata search * Add fixme search metadata * Add groups and content segregation to streams storage * Fix update state method call * Fix content id not being returned in metadata * Enable streams storage variant tests * Wip ~ test cluster it with streams * Change client response from class to type reference * Remove additional version * Fix tabs usage * fix GH workflows * fix tests * remove cache dependencies action and run all tests on master branch * Fix invalid schema integration test for now * disable ISPN build * disable infinispan integration tests Co-authored-by: Aleš Justin <ales.justin@gmail.com> Co-authored-by: Carles Arnal <carnalca@redhat.com> Co-authored-by: Fabian Martinez <46371672+famartinrh@users.noreply.github.com> Co-authored-by: Fabian Martinez <famartin@redhat.com> Co-authored-by: Jakub Senko <jsenko@redhat.com> Co-authored-by: Carles Arnal <carlesarnal92@gmail.com>
1 parent 6df236e commit 5ceb8a8

File tree

735 files changed

+49361
-14206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

735 files changed

+49361
-14206
lines changed

‎.github/scripts/collect_logs.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
set -e
33
echo "Collecting tests logs"
44
mkdir -p artifacts/logs
5-
cp -r tests/target/logs artifacts
5+
cp -r integration-tests/testsuite/target/logs artifacts
66
mkdir -p artifacts/failsafe-reports
7-
cp -r tests/target/failsafe-reports artifacts
7+
cp -r integration-tests/testsuite/target/failsafe-reports artifacts
8+
mkdir -p artifacts/legacy
9+
cp -r integration-tests/legacy-tests/target/logs artifacts/legacy | true

‎.github/test-mvn-deploy/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<dependencies>
1818
<dependency>
1919
<groupId>io.apicurio</groupId>
20-
<artifactId>apicurio-registry-utils-serde</artifactId>
20+
<artifactId>apicurio-registry-serdes-avro-serde</artifactId>
2121
<version>${version.apicurio}</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>io.apicurio</groupId>
25-
<artifactId>apicurio-registry-rest-client</artifactId>
25+
<artifactId>apicurio-registry-client</artifactId>
2626
<version>${version.apicurio}</version>
2727
</dependency>
2828
</dependencies>

‎.github/workflows/integration-tests.yaml

+27-16
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,38 @@ jobs:
2727
run: echo ${{github.actor}}
2828
- name: Checkout Code
2929
uses: actions/checkout@v2
30-
- name: Set up JDK 1.8
31-
uses: actions/setup-java@v1
30+
- name: Set up JDK 11
31+
uses: AdoptOpenJDK/install-jdk@v1
3232
with:
33-
java-version: 1.8
34-
- name: Cache Dependencies
35-
uses: actions/cache@v1
36-
with:
37-
path: ~/.m2/repository
38-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
39-
restore-keys: |
40-
${{ runner.os }}-maven-
33+
version: '11'
34+
architecture: x64
35+
36+
- name: Set test profile to acceptance
37+
if: github.ref != 'refs/heads/master'
38+
run: |
39+
echo "test_profile=acceptance" >> $GITHUB_ENV
40+
41+
- name: Set test profile to all
42+
if: github.ref == 'refs/heads/master'
43+
run: |
44+
echo "test_profile=all" >> $GITHUB_ENV
45+
4146
- name: Build All Variants
42-
run: mvn clean install -Pprod -Psql -Pinfinispan -Pstreams -Pasyncmem -Pkafkasql -DskipTests -pl !tests
47+
run: mvn clean install -Pprod -Psql -Pstreams -Pasyncmem -Pkafkasql -DskipTests # -Pinfinispan
48+
- name: Build integration-tests-common
49+
run: mvn install -Pintegration-tests -pl integration-tests/integration-tests-common
4350
- name: Run Integration Tests - streams
44-
run: mvn verify -Pacceptance -Pstreams -pl tests -Dmaven.javadoc.skip=true --no-transfer-progress
51+
run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Pstreams -pl integration-tests/testsuite -Dmaven.javadoc.skip=true --no-transfer-progress
4552
- name: Run Integration Tests - sql
46-
run: mvn verify -Pacceptance -Psql -pl tests -Dmaven.javadoc.skip=true --no-transfer-progress
47-
- name: Run Integration Tests - infinispan
48-
run: mvn verify -Pacceptance -Pinfinispan -pl tests -Dmaven.javadoc.skip=true --no-transfer-progress
53+
run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Psql -pl integration-tests/testsuite -Dmaven.javadoc.skip=true --no-transfer-progress
54+
# - name: Run Integration Tests - infinispan
55+
# run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Pinfinispan -pl integration-tests/testsuite -Dmaven.javadoc.skip=true --no-transfer-progress
4956
- name: Run Integration Tests - kafkasql
50-
run: mvn verify -Pacceptance -Pkafkasql -pl tests -Dmaven.javadoc.skip=true --no-transfer-progress
57+
run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Pkafkasql -pl integration-tests/testsuite -Dmaven.javadoc.skip=true --no-transfer-progress
58+
- name: Run Legacy Tests - streams
59+
run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Pstreams -pl integration-tests/legacy-tests -Dmaven.javadoc.skip=true --no-transfer-progress
60+
- name: Run Legacy Tests - sql
61+
run: mvn verify -Pintegration-tests -P${{ env.test_profile }} -Psql -pl integration-tests/legacy-tests -Dmaven.javadoc.skip=true --no-transfer-progress
5162
- name: Collect logs
5263
if: failure()
5364
run: ./.github/scripts/collect_logs.sh

‎.github/workflows/kubernetes-tests.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,19 @@ jobs:
2323
with:
2424
ref: ${{ github.event.inputs.branch }}
2525

26-
- name: Set up JDK 1.8
26+
- name: Set up JDK 11
2727
uses: AdoptOpenJDK/install-jdk@v1
2828
with:
29-
version: '8'
29+
version: '11'
3030
architecture: x64
31-
- name: Cache Dependencies
32-
uses: actions/cache@v1
33-
with:
34-
path: ~/.m2/repository
35-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
36-
restore-keys: |
37-
${{ runner.os }}-maven-
3831
- name: Build All Variants
39-
run: mvn clean install -Pprod -Pjpa -Pinfinispan -Pstreams -pl !tests
32+
run: mvn clean install -Pprod -Psql -Pinfinispan -Pstreams
4033

4134
- name: Build The Tagged Docker Images
4235
run: |
4336
cd distro/docker
4437
mvn package -Pprod -DskipTests -Ddocker -Ddocker.tag.name=latest-snapshot
45-
mvn package -Pprod -Pjpa -DskipTests -Ddocker -Ddocker.tag.name=latest-snapshot
38+
mvn package -Pprod -Psql -DskipTests -Ddocker -Ddocker.tag.name=latest-snapshot
4639
mvn package -Pprod -Pinfinispan -DskipTests -Ddocker -Ddocker.tag.name=latest-snapshot
4740
mvn package -Pprod -Pstreams -DskipTests -Ddocker -Ddocker.tag.name=latest-snapshot
4841

‎.github/workflows/release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
with:
3131
node-version: 12
3232

33-
- name: Set up JDK 1.8
33+
- name: Set up JDK 11
3434
uses: AdoptOpenJDK/install-jdk@v1
3535
with:
36-
version: '8'
36+
version: '11'
3737
architecture: x64
3838

3939
- name: Set up settings.xml
@@ -255,10 +255,10 @@ jobs:
255255
needs: ["release"] # The Job gets triggered only after the "release" job has successfully completed. The job doesn't run in case the "release" job fails
256256
if: github.repository_owner == 'Apicurio' && github.event.inputs.branch == 'master'
257257
steps:
258-
- name: Set up JDK 1.8
258+
- name: Set up JDK 11
259259
uses: AdoptOpenJDK/install-jdk@v1
260260
with:
261-
version: '8'
261+
version: '11'
262262
architecture: x64
263263

264264
- name: Checkout Code

‎.github/workflows/verify.yaml

+5-21
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,14 @@ jobs:
2626
- name: Checkout Code with Ref '${{ github.ref }}'
2727
uses: actions/checkout@v2
2828

29-
- name: Set up JDK 1.8
29+
- name: Set up JDK 11
3030
uses: AdoptOpenJDK/install-jdk@v1
3131
with:
32-
version: '8'
32+
version: '11'
3333
architecture: x64
3434

35-
- name: Cache Dependencies
36-
uses: actions/cache@v1
37-
with:
38-
path: ~/.m2/repository
39-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40-
restore-keys: |
41-
${{ runner.os }}-maven-
42-
4335
- name: Build All Variants
44-
run: mvn clean install -Pprod -Psql -Pinfinispan -Pstreams -Pasyncmem -Pkafkasql -pl !tests
36+
run: mvn clean install -Pprod -Psql -Pstreams -Pasyncmem -Pkafkasql #-Pinfinispan
4537

4638
- name: Login to DockerHub Registry
4739
if: github.event_name == 'push'
@@ -84,20 +76,12 @@ jobs:
8476
- name: Checkout Code
8577
uses: actions/checkout@v2
8678

87-
- name: Set up JDK 1.8
79+
- name: Set up JDK 11
8880
uses: AdoptOpenJDK/install-jdk@v1
8981
with:
90-
version: '8'
82+
version: '11'
9183
architecture: x64
9284

93-
- name: Cache Dependencies
94-
uses: actions/cache@v1
95-
with:
96-
path: ~/.m2/repository
97-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
98-
restore-keys: |
99-
${{ runner.os }}-maven-
100-
10185
- name: Build Converters Distro (used in testsuite)
10286
run: mvn install -pl distro/connect-converter -am -DskipTests -Dmaven.javadoc.skip=true --no-transfer-progress
10387

‎app/pom.xml

+19-11
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
<groupId>io.apicurio</groupId>
2525
<artifactId>apicurio-registry-ui</artifactId>
2626
</dependency>
27-
28-
<dependency>
29-
<groupId>io.apicurio</groupId>
30-
<artifactId>apicurio-registry-search-client</artifactId>
31-
</dependency>
32-
3327
<dependency>
3428
<groupId>io.apicurio</groupId>
3529
<artifactId>apicurio-registry-utils-kafka</artifactId>
@@ -58,15 +52,15 @@
5852
</dependency>
5953
<dependency>
6054
<groupId>io.quarkus</groupId>
61-
<artifactId>quarkus-smallrye-openapi</artifactId>
55+
<artifactId>quarkus-vertx</artifactId>
6256
</dependency>
6357
<dependency>
6458
<groupId>io.quarkus</groupId>
65-
<artifactId>quarkus-vertx</artifactId>
59+
<artifactId>quarkus-oidc</artifactId>
6660
</dependency>
6761
<dependency>
6862
<groupId>io.quarkus</groupId>
69-
<artifactId>quarkus-oidc</artifactId>
63+
<artifactId>quarkus-scheduler</artifactId>
7064
</dependency>
7165
<dependency>
7266
<groupId>io.quarkus</groupId>
@@ -111,6 +105,10 @@
111105
<groupId>com.fasterxml.jackson.datatype</groupId>
112106
<artifactId>jackson-datatype-json-org</artifactId>
113107
</dependency>
108+
<dependency>
109+
<groupId>com.fasterxml.jackson.dataformat</groupId>
110+
<artifactId>jackson-dataformat-yaml</artifactId>
111+
</dependency>
114112

115113
<!-- Kafka Connect -->
116114
<dependency>
@@ -161,12 +159,22 @@
161159
</dependency>
162160
<dependency>
163161
<groupId>io.apicurio</groupId>
164-
<artifactId>apicurio-registry-rest-client</artifactId>
162+
<artifactId>apicurio-registry-client</artifactId>
163+
<scope>test</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>io.apicurio</groupId>
167+
<artifactId>apicurio-registry-serdes-avro-serde</artifactId>
168+
<scope>test</scope>
169+
</dependency>
170+
<dependency>
171+
<groupId>io.apicurio</groupId>
172+
<artifactId>apicurio-registry-serdes-protobuf-serde</artifactId>
165173
<scope>test</scope>
166174
</dependency>
167175
<dependency>
168176
<groupId>io.apicurio</groupId>
169-
<artifactId>apicurio-registry-utils-serde</artifactId>
177+
<artifactId>apicurio-registry-serdes-jsonschema-serde</artifactId>
170178
<scope>test</scope>
171179
</dependency>
172180
<dependency>

‎app/src/main/java/io/apicurio/registry/AppConfiguration.java

+3-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
package io.apicurio.registry;
1818

19-
import io.apicurio.registry.search.client.SearchClient;
20-
import io.apicurio.registry.types.Current;
21-
import io.apicurio.registry.utils.PropertiesUtil;
22-
import io.apicurio.registry.utils.RegistryProperties;
19+
import java.util.Properties;
2320

2421
import javax.enterprise.context.ApplicationScoped;
2522
import javax.enterprise.inject.Produces;
2623
import javax.enterprise.inject.spi.InjectionPoint;
27-
import java.util.Properties;
24+
25+
import io.apicurio.registry.utils.PropertiesUtil;
2826

2927
/**
3028
* Generic configuration.
@@ -39,11 +37,4 @@ public Properties properties(InjectionPoint ip) {
3937
return PropertiesUtil.properties(ip);
4038
}
4139

42-
@Produces
43-
@ApplicationScoped
44-
@Current
45-
public SearchClient searchClient(@RegistryProperties("registry.search-index") Properties properties) {
46-
return SearchClient.create(properties);
47-
}
48-
4940
}

‎app/src/main/java/io/apicurio/registry/ccompat/dto/CompatibilityCheckResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* Immutable.
3131
*
3232
* @author Ales Justin
33-
* @author Jakub Senko <jsenko@redhat.com>
33+
* @author Jakub Senko 'jsenko@redhat.com'
3434
*/
3535
@JsonAutoDetect(isGetterVisibility = NONE)
3636
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/CompatibilityLevelDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* Immutable.
3434
*
3535
* @author Ales Justin
36-
* @author Jakub Senko <jsenko@redhat.com>
36+
* @author Jakub Senko 'jsenko@redhat.com'
3737
*/
3838
@JsonAutoDetect(isGetterVisibility = NONE)
3939
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/CompatibilityLevelParamDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
*
30-
* @author Carles Arnal <carnalca@redhat.com>
30+
* @author Carles Arnal 'carnalca@redhat.com'
3131
*/
3232
@JsonAutoDetect(isGetterVisibility = NONE)
3333
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/ModeDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/**
3030
* @author Ales Justin
31-
* @author Jakub Senko <jsenko@redhat.com>
31+
* @author Jakub Senko 'jsenko@redhat.com'
3232
*/
3333
@JsonAutoDetect(isGetterVisibility = NONE)
3434
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/Schema.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
2828

2929
/**
30-
* @author Jakub Senko <jsenko@redhat.com>
30+
* @author Jakub Senko 'jsenko@redhat.com'
3131
*/
3232
@JsonAutoDetect(isGetterVisibility = NONE)
3333
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/SchemaContent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
2424

2525
/**
26-
* @author Jakub Senko <jsenko@redhat.com>
26+
* @author Jakub Senko 'jsenko@redhat.com'
2727
*/
2828
@JsonAutoDetect(isGetterVisibility = NONE)
2929
@AllArgsConstructor

‎app/src/main/java/io/apicurio/registry/ccompat/dto/SchemaId.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
2828

2929
/**
30-
* @author Jakub Senko <jsenko@redhat.com>
30+
* @author Jakub Senko 'jsenko@redhat.com'
3131
*/
3232
@JsonAutoDetect(isGetterVisibility = NONE)
3333
@NoArgsConstructor // required for Jackson

‎app/src/main/java/io/apicurio/registry/ccompat/dto/SchemaInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
2424

2525
/**
26-
* @author Carles Arnal <carles.arnal@redhat.com>
26+
* @author Carles Arnal 'carles.arnal@redhat.com'
2727
*/
2828
@JsonAutoDetect(isGetterVisibility = NONE)
2929
@AllArgsConstructor

‎app/src/main/java/io/apicurio/registry/ccompat/dto/SubjectVersion.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
2424

2525
/**
26-
* @author Carles Arnal <carles.arnal@redhat.com>
26+
* @author Carles Arnal 'carles.arnal@redhat.com'
2727
*/
2828
@JsonAutoDetect(isGetterVisibility = NONE)
2929
@AllArgsConstructor

‎app/src/main/java/io/apicurio/registry/ccompat/rest/CompatibilityResource.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import io.apicurio.registry.ccompat.dto.CompatibilityCheckResponse;
2020
import io.apicurio.registry.ccompat.dto.SchemaContent;
21+
import io.apicurio.registry.metrics.RestMetricsResponseFilteredNameBinding;
2122

2223
import javax.validation.constraints.NotNull;
2324
import javax.ws.rs.Consumes;
@@ -36,9 +37,10 @@
3637
* The compatibility resource allows the user to test schemas for compatibility against specific versions of a subject’s schema.
3738
*
3839
* @author Ales Justin
39-
* @author Jakub Senko <jsenko@redhat.com>
40+
* @author Jakub Senko 'jsenko@redhat.com'
4041
*/
41-
@Path("/ccompat/compatibility")
42+
@Path("/apis/ccompat/v6/compatibility")
43+
@RestMetricsResponseFilteredNameBinding
4244
@Consumes({JSON, OCTET_STREAM, COMPAT_SCHEMA_REGISTRY_V1, COMPAT_SCHEMA_REGISTRY_STABLE_LATEST})
4345
@Produces({JSON, OCTET_STREAM, COMPAT_SCHEMA_REGISTRY_V1, COMPAT_SCHEMA_REGISTRY_STABLE_LATEST})
4446
public interface CompatibilityResource {

0 commit comments

Comments
 (0)