Skip to content

Commit ee117c2

Browse files
andreaTPandreaTP
committed
review comments
1 parent 782392a commit ee117c2

File tree

42 files changed

+137
-152
lines changed

Some content is hidden

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

42 files changed

+137
-152
lines changed

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/AbstractResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected ArtifactVersionMetaDataDto lookupSchema(String groupId, String subject
118118
try {
119119
final String type = schemaType == null ? ArtifactType.AVRO : schemaType;
120120
final String contentType = type.equals(ArtifactType.PROTOBUF) ? ContentTypes.APPLICATION_PROTOBUF
121-
: ContentTypes.APPLICATION_JSON;
121+
: ContentTypes.APPLICATION_JSON;
122122
TypedContent typedSchemaContent = TypedContent.create(ContentHandle.create(schema), contentType);
123123
final List<ArtifactReferenceDto> artifactReferences = parseReferences(schemaReferences, groupId);
124124
ArtifactTypeUtilProvider artifactTypeProvider = factory.getArtifactTypeProvider(type);

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/ApiConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public Schema convert(String subject, StoredArtifactVersionDto storedArtifact) {
3333
public Schema convert(String subject, StoredArtifactVersionDto storedArtifact, String artifactType) {
3434
return new Schema(
3535
convertUnsigned(cconfig.legacyIdModeEnabled.get() ? storedArtifact.getGlobalId()
36-
: storedArtifact.getContentId()),
36+
: storedArtifact.getContentId()),
3737
subject, convertUnsigned(storedArtifact.getVersionOrder()),
3838
storedArtifact.getContent().content(), artifactType,
3939
storedArtifact.getReferences().stream().map(this::convert).collect(Collectors.toList()));

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/SubjectVersionsResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public SchemaId register(String subject, SchemaInfo request, Boolean normalize,
107107
ArtifactVersionMetaDataDto artifactMeta = createOrUpdateArtifact(subject, request.getSchema(),
108108
artifactType, request.getReferences(), groupId);
109109
sid = cconfig.legacyIdModeEnabled.get() ? artifactMeta.getGlobalId()
110-
: artifactMeta.getContentId();
110+
: artifactMeta.getContentId();
111111
} catch (InvalidArtifactTypeException ex) {
112112
// If no artifact type can be inferred, throw invalid schema ex
113113
throw new UnprocessableEntityException(ex.getMessage());

‎app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,8 @@ public List<ConfigurationProperty> listConfigProperties() {
352352
return dynamicPropertyIndex.getAcceptedPropertyNames().stream()
353353
.sorted((pname1, pname2) -> pname1.compareTo(pname2))
354354
.map(pname -> propsI.containsKey(pname)
355-
? dtoToConfigurationProperty(dynamicPropertyIndex.getProperty(pname),
356-
propsI.get(pname))
357-
: defToConfigurationProperty(dynamicPropertyIndex.getProperty(pname)))
355+
? dtoToConfigurationProperty(dynamicPropertyIndex.getProperty(pname), propsI.get(pname))
356+
: defToConfigurationProperty(dynamicPropertyIndex.getProperty(pname)))
358357
.collect(Collectors.toList());
359358
}
360359

‎app/src/main/java/io/apicurio/registry/rest/v2/GroupsResourceImpl.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public GroupSearchResults listGroups(BigInteger limit, BigInteger offset, SortOr
382382

383383
final OrderBy oBy = OrderBy.valueOf(orderby.name());
384384
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
385-
: OrderDirection.desc;
385+
: OrderDirection.desc;
386386

387387
Set<SearchFilter> filters = Collections.emptySet();
388388

@@ -824,7 +824,7 @@ public ArtifactSearchResults listArtifactsInGroup(String groupId, BigInteger lim
824824

825825
final OrderBy oBy = OrderBy.valueOf(orderby.name());
826826
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
827-
: OrderDirection.desc;
827+
: OrderDirection.desc;
828828

829829
Set<SearchFilter> filters = new HashSet<>();
830830
filters.add(SearchFilter.ofGroupId(defaultGroupIdToNull(groupId)));
@@ -1005,8 +1005,7 @@ private ArtifactMetaData createArtifactWithRefs(String groupId, String xRegistry
10051005
String calculatedSha = null;
10061006
try {
10071007
RegistryHashAlgorithm algorithm = (xRegistryHashAlgorithm == null)
1008-
? RegistryHashAlgorithm.SHA256
1009-
: RegistryHashAlgorithm.valueOf(xRegistryHashAlgorithm);
1008+
? RegistryHashAlgorithm.SHA256 : RegistryHashAlgorithm.valueOf(xRegistryHashAlgorithm);
10101009
switch (algorithm) {
10111010
case MD5:
10121011
calculatedSha = Hashing.md5().hashString(content.content(), StandardCharsets.UTF_8)

‎app/src/main/java/io/apicurio/registry/rest/v2/SearchResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ArtifactSearchResults searchArtifacts(String name, BigInteger offset, Big
8181

8282
final OrderBy oBy = OrderBy.valueOf(orderby.name());
8383
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
84-
: OrderDirection.desc;
84+
: OrderDirection.desc;
8585

8686
Set<SearchFilter> filters = new HashSet<SearchFilter>();
8787
if (!StringUtil.isEmpty(name)) {
@@ -149,7 +149,7 @@ public ArtifactSearchResults searchArtifactsByContent(Boolean canonical, String
149149
}
150150
final OrderBy oBy = OrderBy.valueOf(orderby.name());
151151
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
152-
: OrderDirection.desc;
152+
: OrderDirection.desc;
153153

154154
if (canonical == null) {
155155
canonical = Boolean.FALSE;

‎app/src/main/java/io/apicurio/registry/rest/v2/V2ApiUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public static int compare(SortOrder sortOrder, ArtifactMetaDataDto metaDataDto1,
253253
name2 = metaDataDto2.getArtifactId();
254254
}
255255
return sortOrder == SortOrder.desc ? name2.compareToIgnoreCase(name1)
256-
: name1.compareToIgnoreCase(name2);
256+
: name1.compareToIgnoreCase(name2);
257257
}
258258

259259
public static ArtifactSearchResults dtoToSearchResults(ArtifactSearchResultsDto dto) {

‎app/src/main/java/io/apicurio/registry/rest/v3/AdminResourceImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ public List<ConfigurationProperty> listConfigProperties() {
384384
// on whether the value is actually configured and stored in the DB or not).
385385
return dynamicPropertyIndex.getAcceptedPropertyNames().stream().sorted(String::compareTo)
386386
.map(pname -> propsI.containsKey(pname)
387-
? V3ApiUtil.dtoToConfigurationProperty(dynamicPropertyIndex.getProperty(pname),
388-
propsI.get(pname))
389-
: defToConfigurationProperty(dynamicPropertyIndex.getProperty(pname)))
387+
? V3ApiUtil.dtoToConfigurationProperty(dynamicPropertyIndex.getProperty(pname),
388+
propsI.get(pname))
389+
: defToConfigurationProperty(dynamicPropertyIndex.getProperty(pname)))
390390
.collect(Collectors.toList());
391391
}
392392

‎app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public GroupSearchResults listGroups(BigInteger limit, BigInteger offset, SortOr
270270

271271
final OrderBy oBy = OrderBy.valueOf(orderby.name());
272272
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
273-
: OrderDirection.desc;
273+
: OrderDirection.desc;
274274

275275
Set<SearchFilter> filters = Collections.emptySet();
276276

@@ -612,7 +612,7 @@ public ArtifactSearchResults listArtifactsInGroup(String groupId, BigInteger lim
612612

613613
final OrderBy oBy = OrderBy.valueOf(orderby.name());
614614
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
615-
: OrderDirection.desc;
615+
: OrderDirection.desc;
616616

617617
Set<SearchFilter> filters = new HashSet<>();
618618
filters.add(SearchFilter.ofGroupId(new GroupId(groupId).getRawGroupIdWithNull()));
@@ -778,7 +778,7 @@ public VersionSearchResults listArtifactVersions(String groupId, String artifact
778778

779779
final OrderBy oBy = OrderBy.valueOf(orderby.name());
780780
final OrderDirection oDir = order == null || order == SortOrder.desc ? OrderDirection.asc
781-
: OrderDirection.desc;
781+
: OrderDirection.desc;
782782

783783
Set<SearchFilter> filters = Set.of(
784784
SearchFilter.ofGroupId(new GroupId(groupId).getRawGroupIdWithNull()),

‎app/src/main/java/io/apicurio/registry/rest/v3/SearchResourceImpl.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public ArtifactSearchResults searchArtifacts(String name, BigInteger offset, Big
7474

7575
final OrderBy oBy = OrderBy.valueOf(orderby.name());
7676
final OrderDirection oDir = (order == null || order == SortOrder.asc) ? OrderDirection.asc
77-
: OrderDirection.desc;
77+
: OrderDirection.desc;
7878

7979
Set<SearchFilter> filters = new HashSet<SearchFilter>();
8080
if (!StringUtil.isEmpty(name)) {
@@ -139,7 +139,7 @@ public ArtifactSearchResults searchArtifactsByContent(Boolean canonical, String
139139
}
140140
final OrderBy oBy = OrderBy.valueOf(orderby.name());
141141
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
142-
: OrderDirection.desc;
142+
: OrderDirection.desc;
143143

144144
if (canonical == null) {
145145
canonical = Boolean.FALSE;
@@ -186,7 +186,7 @@ public GroupSearchResults searchGroups(BigInteger offset, BigInteger limit, Sort
186186

187187
final OrderBy oBy = OrderBy.valueOf(orderby.name());
188188
final OrderDirection oDir = order == null || order == SortOrder.asc ? OrderDirection.asc
189-
: OrderDirection.desc;
189+
: OrderDirection.desc;
190190

191191
Set<SearchFilter> filters = new HashSet<SearchFilter>();
192192
if (!StringUtil.isEmpty(groupId)) {
@@ -241,7 +241,7 @@ public VersionSearchResults searchVersions(String version, BigInteger offset, Bi
241241

242242
final OrderBy oBy = OrderBy.valueOf(orderby.name());
243243
final OrderDirection oDir = (order == null || order == SortOrder.asc) ? OrderDirection.asc
244-
: OrderDirection.desc;
244+
: OrderDirection.desc;
245245

246246
Set<SearchFilter> filters = new HashSet<SearchFilter>();
247247
if (!StringUtil.isEmpty(groupId)) {
@@ -312,7 +312,7 @@ public VersionSearchResults searchVersionsByContent(Boolean canonical, String ar
312312

313313
final OrderBy oBy = OrderBy.valueOf(orderby.name());
314314
final OrderDirection oDir = (order == null || order == SortOrder.asc) ? OrderDirection.asc
315-
: OrderDirection.desc;
315+
: OrderDirection.desc;
316316

317317
Set<SearchFilter> filters = new HashSet<SearchFilter>();
318318
if (!StringUtil.isEmpty(groupId)) {

‎app/src/main/java/io/apicurio/registry/rest/v3/SystemResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private UserInterfaceConfigAuth uiAuthConfig() {
100100
rval.setObacEnabled(authConfig.isObacEnabled());
101101
rval.setRbacEnabled(authConfig.isRbacEnabled());
102102
rval.setType(authConfig.isOidcAuthEnabled() ? UserInterfaceConfigAuth.Type.oidc
103-
: authConfig.isBasicAuthEnabled() ? UserInterfaceConfigAuth.Type.basic
104-
: UserInterfaceConfigAuth.Type.none);
103+
: authConfig.isBasicAuthEnabled() ? UserInterfaceConfigAuth.Type.basic
104+
: UserInterfaceConfigAuth.Type.none);
105105
if (authConfig.isOidcAuthEnabled()) {
106106
Map<String, String> options = new HashMap<>();
107107
options.put("url", uiConfig.authOidcUrl);

‎app/src/main/java/io/apicurio/registry/rest/v3/V3ApiUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static int compare(SortOrder sortOrder, ArtifactMetaDataDto metaDataDto1,
118118
name2 = metaDataDto2.getArtifactId();
119119
}
120120
return sortOrder == SortOrder.desc ? name2.compareToIgnoreCase(name1)
121-
: name1.compareToIgnoreCase(name2);
121+
: name1.compareToIgnoreCase(name2);
122122
}
123123

124124
public static ArtifactSearchResults dtoToSearchResults(ArtifactSearchResultsDto dto) {

‎app/src/main/java/io/apicurio/registry/rules/compatibility/CompatibilityRuleExecutor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void execute(RuleContext context) throws RuleViolationException {
4141
ArtifactTypeUtilProvider provider = factory.getArtifactTypeProvider(context.getArtifactType());
4242
CompatibilityChecker checker = provider.getCompatibilityChecker();
4343
List<TypedContent> existingArtifacts = context.getCurrentContent() != null
44-
? context.getCurrentContent()
45-
: emptyList();
44+
? context.getCurrentContent() : emptyList();
4645
CompatibilityExecutionResult compatibilityExecutionResult = checker.testCompatibility(level,
4746
existingArtifacts, context.getUpdatedContent(), context.getResolvedReferences());
4847
if (!compatibilityExecutionResult.isCompatible()) {

‎app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/KafkaSqlRegistryStorage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public Pair<ArtifactMetaDataDto, ArtifactVersionMetaDataDto> createArtifact(Stri
379379
String content = versionContent != null ? versionContent.getContent().content() : null;
380380
String contentType = versionContent != null ? versionContent.getContentType() : null;
381381
List<ArtifactReferenceDto> references = versionContent != null ? versionContent.getReferences()
382-
: null;
382+
: null;
383383
var message = new CreateArtifact8Message(groupId, artifactId, artifactType, artifactMetaData, version,
384384
contentType, content, references, versionMetaData, versionBranches);
385385
var uuid = ConcurrentUtil.get(submitter.submitMessage(message));
@@ -866,7 +866,7 @@ public void createOrUpdateArtifactBranch(GAV gav, BranchId branchId) {
866866
@Override
867867
public void createOrReplaceArtifactBranch(GA ga, BranchId branchId, List<VersionId> versions) {
868868
List<String> rawVersions = versions == null ? List.of()
869-
: versions.stream().map(v -> v.getRawVersionId()).collect(Collectors.toList());
869+
: versions.stream().map(v -> v.getRawVersionId()).collect(Collectors.toList());
870870
var message = new CreateOrReplaceArtifactBranch3Message(ga.getRawGroupIdWithNull(),
871871
ga.getRawArtifactId(), branchId.getRawBranchId(), rawVersions);
872872
var uuid = ConcurrentUtil.get(submitter.submitMessage(message));

‎app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/messages/CreateArtifact8Message.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ public class CreateArtifact8Message extends AbstractMessage {
4343
@Override
4444
public Object dispatchTo(RegistryStorage storage) {
4545
ContentHandle handle = content != null ? ContentHandle.create(content) : null;
46-
ContentWrapperDto versionContent = content != null
47-
? ContentWrapperDto.builder().contentType(contentType).content(handle).references(references)
48-
.build()
49-
: null;
46+
ContentWrapperDto versionContent = content != null ? ContentWrapperDto.builder()
47+
.contentType(contentType).content(handle).references(references).build()
48+
: null;
5049
return storage.createArtifact(groupId, artifactId, artifactType, artifactMetaDataDto, version,
5150
versionContent, versionMetaData, versionBranches);
5251
}

‎app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/messages/CreateArtifactVersion7Message.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ public class CreateArtifactVersion7Message extends AbstractMessage {
4141
@Override
4242
public Object dispatchTo(RegistryStorage storage) {
4343
ContentHandle handle = content != null ? ContentHandle.create(content) : null;
44-
ContentWrapperDto contentDto = content != null
45-
? ContentWrapperDto.builder().contentType(contentType).content(handle).references(references)
46-
.build()
47-
: null;
44+
ContentWrapperDto contentDto = content != null ? ContentWrapperDto.builder().contentType(contentType)
45+
.content(handle).references(references).build()
46+
: null;
4847
return storage.createArtifactVersion(groupId, artifactId, version, artifactType, contentDto, metaData,
4948
branches);
5049
}

‎app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/messages/CreateOrReplaceArtifactBranch3Message.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Object dispatchTo(RegistryStorage storage) {
3838
GA ga = new GA(groupId, artifactId);
3939
BranchId bid = new BranchId(branchId);
4040
List<VersionId> versionIds = versions == null ? List.of()
41-
: versions.stream().map(v -> new VersionId(v)).collect(Collectors.toList());
41+
: versions.stream().map(v -> new VersionId(v)).collect(Collectors.toList());
4242
storage.createOrReplaceArtifactBranch(ga, bid, versionIds);
4343
return null;
4444
}

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,7 @@ public Pair<ArtifactMetaDataDto, ArtifactVersionMetaDataDto> createArtifact(Stri
460460
Date createdOn = new Date();
461461

462462
EditableArtifactMetaDataDto amd = artifactMetaData == null
463-
? EditableArtifactMetaDataDto.builder().build()
464-
: artifactMetaData;
463+
? EditableArtifactMetaDataDto.builder().build() : artifactMetaData;
465464

466465
// Create the group if it doesn't exist yet.
467466
if (groupId != null && !isGroupExists(groupId)) {

‎app/src/test/java/io/apicurio/registry/noprofile/JsonSerdeTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public void testSchema() throws Exception {
4040
Person person = new Person("Ales", "Justin", 23);
4141

4242
try (JsonSchemaKafkaSerializer<Person> serializer = new JsonSchemaKafkaSerializer<>(clientV3, true);
43-
JsonSchemaKafkaDeserializer<Person> deserializer = new JsonSchemaKafkaDeserializer<>(clientV3,
44-
true)) {
43+
JsonSchemaKafkaDeserializer<Person> deserializer = new JsonSchemaKafkaDeserializer<>(clientV3,
44+
true)) {
4545

4646
Map<String, String> configs = Map.of(SerdeConfig.EXPLICIT_ARTIFACT_GROUP_ID, groupId);
4747
serializer.configure(configs, false);

‎app/src/test/java/io/apicurio/registry/noprofile/ccompat/rest/v7/ConfluentClientTest.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ public void testSerdeProtobufSchema() {
107107
TestCmmn.UUID.class.getName());
108108

109109
try (KafkaProtobufSerializer<TestCmmn.UUID> serializer = new KafkaProtobufSerializer<>(client);
110-
KafkaProtobufDeserializer<TestCmmn.UUID> deserializer = new KafkaProtobufDeserializer<>(
111-
client)) {
110+
KafkaProtobufDeserializer<TestCmmn.UUID> deserializer = new KafkaProtobufDeserializer<>(client)) {
112111

113112
serializer.configure(config, false);
114113
deserializer.configure(config, false);
@@ -225,7 +224,7 @@ public void testSerdeAvro() throws Exception {
225224
});
226225

227226
try (KafkaAvroSerializer serializer = new KafkaAvroSerializer(client);
228-
KafkaAvroDeserializer deserializer = new KafkaAvroDeserializer(client)) {
227+
KafkaAvroDeserializer deserializer = new KafkaAvroDeserializer(client)) {
229228

230229
GenericData.Record record = new GenericData.Record(new Schema.Parser().parse(rawSchema));
231230
record.put("bar", "somebar");
@@ -251,10 +250,10 @@ public void testSerdeJsonSchema() {
251250
config.put(KafkaJsonSchemaSerializerConfig.SCHEMA_REGISTRY_URL_CONFIG,
252251
"http://localhost:" + testPort + "/apis/ccompat/v7");
253252

254-
try (KafkaJsonSchemaSerializer serializer = new KafkaJsonSchemaSerializer(client,
255-
new HashMap(config));
256-
KafkaJsonSchemaDeserializer deserializer = new KafkaJsonSchemaDeserializer(client, config,
257-
SchemaContent.class)) {
253+
try (
254+
KafkaJsonSchemaSerializer serializer = new KafkaJsonSchemaSerializer(client, new HashMap(config));
255+
KafkaJsonSchemaDeserializer deserializer = new KafkaJsonSchemaDeserializer(client, config,
256+
SchemaContent.class)) {
258257

259258
byte[] bytes = serializer.serialize(subject, schemaContent);
260259
Object deserialized = deserializer.deserialize(subject, bytes);

0 commit comments

Comments
 (0)