Merge pull request quarkusio#44033 from AmitPr/nondet-registry-serial…

…ization Add JsonPropertyOrder annotations to prevent order-dependent test failures
radcortez · Oct 24, 2024 · c825cfb · c825cfb
2 parents 291e830 + 6917d50
commit c825cfb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/...rojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java b/...rojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import io.quarkus.registry.json.JsonBuilder;
 
@@ -20,6 +21,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "id", "name", "description", "metadata" })
 public class CategoryImpl implements Category {
 
     private final String id;

diff --git a/...ojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java b/...ojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
@@ -32,6 +33,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "name", "description", "metadata", "artifact", "origins" })
 public class ExtensionImpl implements Extension {
     private final String name;
     private final String description;

diff --git a/.../tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java b/.../tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
@@ -28,6 +29,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "platforms", "metadata" })
 public class PlatformCatalogImpl extends JsonEntityWithAnySupport implements PlatformCatalog {
 
     private final Map<String, Platform> platforms;

diff --git a/...rojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java b/...rojects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
@@ -24,6 +25,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "platformKey", "name", "streams", "metadata" })
 public class PlatformImpl extends JsonEntityWithAnySupport implements Platform {
 
     private final String platformKey;

diff --git a/.../tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java b/.../tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java
@@ -7,6 +7,7 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import io.quarkus.maven.dependency.ArtifactCoords;
@@ -23,6 +24,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "version", "memberBoms", "quarkusCoreVersion", "upstreamQuarkusCoreVersion", "metadata" })
 public class PlatformReleaseImpl extends JsonEntityWithAnySupport implements PlatformRelease {
     private final PlatformReleaseVersion version;
     private final Collection<ArtifactCoords> memberBoms;

diff --git a/...s/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java b/...s/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import io.quarkus.registry.json.JsonBuilder;
@@ -23,6 +24,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "id", "name", "releases", "metadata" })
 public class PlatformStreamImpl extends JsonEntityWithAnySupport implements PlatformStream {
     private final String id;
     private final String name;

diff --git a/.../registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java b/.../registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import io.quarkus.maven.dependency.ArtifactCoords;
 import io.quarkus.registry.json.JsonBuilder;
@@ -18,6 +19,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "disabled", "artifact" })
 public class RegistryArtifactConfigImpl implements RegistryArtifactConfig {
 
     protected final boolean disabled;

diff --git a/...registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java b/...registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import io.quarkus.registry.json.JsonBuilder;
 
@@ -17,6 +18,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "id", "url" })
 public class RegistryMavenRepoConfigImpl implements RegistryMavenRepoConfig {
 
     private final String id;

diff --git a/...ry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java b/...ry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import io.quarkus.registry.json.JsonBuilder;
 
@@ -19,6 +20,7 @@
  * @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+@JsonPropertyOrder({ "recognizedVersionsExpression", "recognizedGroupIds", "exclusiveProvider" })
 public class RegistryQuarkusVersionsConfigImpl implements RegistryQuarkusVersionsConfig {
 
     private final String recognizedVersionsExpression;