Skip to content

Commit 491cecd

Browse files
fvalerifvaleri
authored
Fix model warnings (strimzi#10226)
Signed-off-by: Federico Valeri <[email protected]>
1 parent f8c09f1 commit 491cecd

File tree

121 files changed

+505
-395
lines changed

Some content is hidden

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

121 files changed

+505
-395
lines changed

‎api/src/main/java/io/strimzi/api/kafka/Crds.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public static <T extends CustomResource> List<String> apiVersions(Class<T> cls)
320320

321321
List<String> versions;
322322
try {
323-
versions = singletonList(group + "/" + (String) cls.getField("VERSION").get(null));
323+
versions = singletonList(group + "/" + cls.getField("VERSION").get(null));
324324
} catch (NoSuchFieldException e) {
325325
versions = ((List<String>) cls.getField("VERSIONS").get(null)).stream().map(v ->
326326
group + "/" + v).collect(Collectors.toList());

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridge.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.util.Map;
2727
import java.util.function.Predicate;
2828

29-
import static java.util.Collections.emptyMap;
30-
3129
@JsonDeserialize
3230
@Crd(
3331
spec = @Crd.Spec(
@@ -106,7 +104,7 @@ public class KafkaBridge extends CustomResource<KafkaBridgeSpec, KafkaBridgeStat
106104
private String apiVersion;
107105
private String kind;
108106

109-
private final Map<String, Object> additionalProperties = new HashMap<>(0);
107+
private Map<String, Object> additionalProperties;
110108

111109
public KafkaBridge() {
112110
super();
@@ -132,11 +130,14 @@ public KafkaBridgeStatus getStatus() {
132130

133131
@Override
134132
public Map<String, Object> getAdditionalProperties() {
135-
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
133+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
136134
}
137135

138136
@Override
139137
public void setAdditionalProperty(String name, Object value) {
138+
if (this.additionalProperties == null) {
139+
this.additionalProperties = new HashMap<>(2);
140+
}
140141
this.additionalProperties.put(name, value);
141142
}
142143

@@ -152,5 +153,4 @@ public void setAdditionalProperty(String name, Object value) {
152153
public static Predicate<KafkaBridge> isReady() {
153154
return CustomResourceConditions.isReady();
154155
}
155-
156156
}

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeAdminClientSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {
2929
@Override
3030
@Description("The Kafka AdminClient configuration used for AdminClient instances created by the bridge.")
3131
public Map<String, Object> getConfig() {
32-
return config;
32+
return this.config != null ? this.config : Map.of();
3333
}
3434
}

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeClientSpec.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import java.util.HashMap;
1515
import java.util.Map;
1616

17-
import static java.util.Collections.emptyMap;
18-
1917
@Buildable(
2018
editableEnabled = false,
2119
builderPackage = Constants.FABRIC8_KUBERNETES_API
@@ -24,12 +22,11 @@
2422
@EqualsAndHashCode
2523
@ToString
2624
public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving {
27-
protected Map<String, Object> config = new HashMap<>(0);
28-
25+
protected Map<String, Object> config;
2926
private Map<String, Object> additionalProperties;
3027

3128
public Map<String, Object> getConfig() {
32-
return config;
29+
return this.config != null ? this.config : Map.of();
3330
}
3431

3532
public void setConfig(Map<String, Object> config) {
@@ -38,13 +35,13 @@ public void setConfig(Map<String, Object> config) {
3835

3936
@Override
4037
public Map<String, Object> getAdditionalProperties() {
41-
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
38+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
4239
}
4340

4441
@Override
4542
public void setAdditionalProperty(String name, Object value) {
4643
if (this.additionalProperties == null) {
47-
this.additionalProperties = new HashMap<>(1);
44+
this.additionalProperties = new HashMap<>(2);
4845
}
4946
this.additionalProperties.put(name, value);
5047
}

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {
3636
@Override
3737
@Description("The Kafka consumer configuration used for consumer instances created by the bridge. Properties with the following prefixes cannot be set: " + FORBIDDEN_PREFIXES + " (with the exception of: " + FORBIDDEN_PREFIX_EXCEPTIONS + ").")
3838
public Map<String, Object> getConfig() {
39-
return config;
39+
return this.config != null ? this.config : Map.of();
4040
}
4141

4242
@JsonInclude(JsonInclude.Include.NON_DEFAULT)

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving {
3636
public static final String HTTP_DEFAULT_HOST = "0.0.0.0";
3737
private int port = HTTP_DEFAULT_PORT;
3838
private KafkaBridgeHttpCors cors;
39-
private Map<String, Object> additionalProperties = new HashMap<>(0);
39+
private Map<String, Object> additionalProperties;
4040

4141
public KafkaBridgeHttpConfig() {
4242
}
@@ -68,11 +68,14 @@ public void setCors(KafkaBridgeHttpCors cors) {
6868

6969
@Override
7070
public Map<String, Object> getAdditionalProperties() {
71-
return this.additionalProperties;
71+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
7272
}
7373

7474
@Override
7575
public void setAdditionalProperty(String name, Object value) {
76+
if (this.additionalProperties == null) {
77+
this.additionalProperties = new HashMap<>(2);
78+
}
7679
this.additionalProperties.put(name, value);
7780
}
7881
}

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpCors.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class KafkaBridgeHttpCors implements UnknownPropertyPreserving {
3333
private List<String> allowedOrigins = null;
3434
private List<String> allowedMethods = null;
35-
private Map<String, Object> additionalProperties = new HashMap<>(0);
35+
private Map<String, Object> additionalProperties;
3636

3737
@Description("List of allowed origins. " +
3838
"Java regular expressions can be used.")
@@ -59,11 +59,14 @@ public void setAllowedMethods(List<String> allowedMethods) {
5959

6060
@Override
6161
public Map<String, Object> getAdditionalProperties() {
62-
return this.additionalProperties;
62+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
6363
}
6464

6565
@Override
6666
public void setAdditionalProperty(String name, Object value) {
67+
if (this.additionalProperties == null) {
68+
this.additionalProperties = new HashMap<>(2);
69+
}
6770
this.additionalProperties.put(name, value);
6871
}
6972
}

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {
3333
@Override
3434
@Description("The Kafka producer configuration used for producer instances created by the bridge. Properties with the following prefixes cannot be set: " + FORBIDDEN_PREFIXES + " (with the exception of: " + FORBIDDEN_PREFIX_EXCEPTIONS + ").")
3535
public Map<String, Object> getConfig() {
36-
return config;
36+
return this.config != null ? this.config : Map.of();
3737
}
3838

3939
@JsonInclude(JsonInclude.Include.NON_DEFAULT)

‎api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class KafkaBridgeTemplate implements UnknownPropertyPreserving {
4242
private ContainerTemplate initContainer;
4343
private ResourceTemplate clusterRoleBinding;
4444
private ResourceTemplate serviceAccount;
45-
private Map<String, Object> additionalProperties = new HashMap<>(0);
45+
private Map<String, Object> additionalProperties;
4646

4747
@Description("Template for Kafka Bridge `Deployment`.")
4848
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -126,11 +126,14 @@ public void setServiceAccount(ResourceTemplate serviceAccount) {
126126

127127
@Override
128128
public Map<String, Object> getAdditionalProperties() {
129-
return this.additionalProperties;
129+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
130130
}
131131

132132
@Override
133133
public void setAdditionalProperty(String name, Object value) {
134+
if (this.additionalProperties == null) {
135+
this.additionalProperties = new HashMap<>(2);
136+
}
134137
this.additionalProperties.put(name, value);
135138
}
136139
}

‎api/src/main/java/io/strimzi/api/kafka/model/common/CertAndKeySecretSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class CertAndKeySecretSource implements UnknownPropertyPreserving {
3030
private String secretName;
3131
private String certificate;
3232
private String key;
33-
3433
private Map<String, Object> additionalProperties;
3534

3635
@Description("The name of the Secret containing the certificate.")
@@ -65,13 +64,13 @@ public void setKey(String key) {
6564

6665
@Override
6766
public Map<String, Object> getAdditionalProperties() {
68-
return this.additionalProperties;
67+
return this.additionalProperties != null ? this.additionalProperties : Map.of();
6968
}
7069

7170
@Override
7271
public void setAdditionalProperty(String name, Object value) {
7372
if (this.additionalProperties == null) {
74-
this.additionalProperties = new HashMap<>(1);
73+
this.additionalProperties = new HashMap<>(2);
7574
}
7675
this.additionalProperties.put(name, value);
7776
}

0 commit comments

Comments
 (0)