Skip to content

Commit 6917d50

Browse files
committed
JsonPropertyOrder annotations to prevent order-dependent serialization tests from failing
1 parent 744bc75 commit 6917d50

File tree

9 files changed

+18
-0
lines changed

9 files changed

+18
-0
lines changed

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/CategoryImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.fasterxml.jackson.annotation.JsonIgnore;
88
import com.fasterxml.jackson.annotation.JsonInclude;
9+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
910

1011
import io.quarkus.registry.json.JsonBuilder;
1112

@@ -20,6 +21,7 @@
2021
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2122
*/
2223
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
24+
@JsonPropertyOrder({ "id", "name", "description", "metadata" })
2325
public class CategoryImpl implements Category {
2426

2527
private final String id;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.fasterxml.jackson.annotation.JsonIdentityReference;
1414
import com.fasterxml.jackson.annotation.JsonIgnore;
1515
import com.fasterxml.jackson.annotation.JsonInclude;
16+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1617
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1718
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1819

@@ -32,6 +33,7 @@
3233
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
3334
*/
3435
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
36+
@JsonPropertyOrder({ "name", "description", "metadata", "artifact", "origins" })
3537
public class ExtensionImpl implements Extension {
3638
private final String name;
3739
private final String description;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalogImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import com.fasterxml.jackson.annotation.JsonIgnore;
1111
import com.fasterxml.jackson.annotation.JsonInclude;
12+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1213
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1314
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1415

@@ -28,6 +29,7 @@
2829
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2930
*/
3031
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
32+
@JsonPropertyOrder({ "platforms", "metadata" })
3133
public class PlatformCatalogImpl extends JsonEntityWithAnySupport implements PlatformCatalog {
3234

3335
private final Map<String, Platform> platforms;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010
import com.fasterxml.jackson.annotation.JsonInclude;
11+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1112
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1213
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1314

@@ -24,6 +25,7 @@
2425
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2526
*/
2627
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
28+
@JsonPropertyOrder({ "platformKey", "name", "streams", "metadata" })
2729
public class PlatformImpl extends JsonEntityWithAnySupport implements Platform {
2830

2931
private final String platformKey;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformReleaseImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Objects;
88

99
import com.fasterxml.jackson.annotation.JsonInclude;
10+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1011
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1112

1213
import io.quarkus.maven.dependency.ArtifactCoords;
@@ -23,6 +24,7 @@
2324
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2425
*/
2526
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
27+
@JsonPropertyOrder({ "version", "memberBoms", "quarkusCoreVersion", "upstreamQuarkusCoreVersion", "metadata" })
2628
public class PlatformReleaseImpl extends JsonEntityWithAnySupport implements PlatformRelease {
2729
private final PlatformReleaseVersion version;
2830
private final Collection<ArtifactCoords> memberBoms;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import com.fasterxml.jackson.annotation.JsonIgnore;
1010
import com.fasterxml.jackson.annotation.JsonInclude;
11+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
1112
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
1213

1314
import io.quarkus.registry.json.JsonBuilder;
@@ -23,6 +24,7 @@
2324
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2425
*/
2526
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
27+
@JsonPropertyOrder({ "id", "name", "releases", "metadata" })
2628
public class PlatformStreamImpl extends JsonEntityWithAnySupport implements PlatformStream {
2729
private final String id;
2830
private final String name;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfigImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.fasterxml.jackson.annotation.JsonIgnore;
66
import com.fasterxml.jackson.annotation.JsonInclude;
7+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
78

89
import io.quarkus.maven.dependency.ArtifactCoords;
910
import io.quarkus.registry.json.JsonBuilder;
@@ -18,6 +19,7 @@
1819
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
1920
*/
2021
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
22+
@JsonPropertyOrder({ "disabled", "artifact" })
2123
public class RegistryArtifactConfigImpl implements RegistryArtifactConfig {
2224

2325
protected final boolean disabled;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfigImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.fasterxml.jackson.annotation.JsonIgnore;
66
import com.fasterxml.jackson.annotation.JsonInclude;
7+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
78

89
import io.quarkus.registry.json.JsonBuilder;
910

@@ -17,6 +18,7 @@
1718
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
1819
*/
1920
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
21+
@JsonPropertyOrder({ "id", "url" })
2022
public class RegistryMavenRepoConfigImpl implements RegistryMavenRepoConfig {
2123

2224
private final String id;

independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.fasterxml.jackson.annotation.JsonIgnore;
88
import com.fasterxml.jackson.annotation.JsonInclude;
9+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
910

1011
import io.quarkus.registry.json.JsonBuilder;
1112

@@ -19,6 +20,7 @@
1920
* @see JsonBuilder.JsonBuilderSerializer for building a builder before serializing it.
2021
*/
2122
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
23+
@JsonPropertyOrder({ "recognizedVersionsExpression", "recognizedGroupIds", "exclusiveProvider" })
2224
public class RegistryQuarkusVersionsConfigImpl implements RegistryQuarkusVersionsConfig {
2325

2426
private final String recognizedVersionsExpression;

0 commit comments

Comments
 (0)