Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix model warnings #10226

Merged
merged 5 commits into from
Jun 14, 2024
Merged

Fix model warnings #10226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5845da0
Fix model warnings
fvaleri Jun 13, 2024
5b5609f
Inialize the hash map with size 2
fvaleri Jun 14, 2024
3be889a
Replace emptyMap with Map.of
fvaleri Jun 14, 2024
26736c2
Address nits
fvaleri Jun 14, 2024
25c4e8a
Restore comment
fvaleri Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/io/strimzi/api/kafka/Crds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public static <T extends CustomResource> List<String> apiVersions(Class<T> cls)

List<String> versions;
try {
versions = singletonList(group + "/" + (String) cls.getField("VERSION").get(null));
versions = singletonList(group + "/" + cls.getField("VERSION").get(null));
scholzj marked this conversation as resolved.
Show resolved Hide resolved
} catch (NoSuchFieldException e) {
versions = ((List<String>) cls.getField("VERSIONS").get(null)).stream().map(v ->
group + "/" + v).collect(Collectors.toList());
Expand Down
6 changes: 4 additions & 2 deletions api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public class KafkaBridge extends CustomResource<KafkaBridgeSpec, KafkaBridgeStat
private String apiVersion;
private String kind;

private final Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;
fvaleri marked this conversation as resolved.
Show resolved Hide resolved

public KafkaBridge() {
super();
Expand Down Expand Up @@ -137,6 +137,9 @@ public Map<String, Object> getAdditionalProperties() {

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
fvaleri marked this conversation as resolved.
Show resolved Hide resolved
}
this.additionalProperties.put(name, value);
}

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

}
4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeAdminClientSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import java.util.Map;

import static java.util.Collections.emptyMap;

@Buildable(
editableEnabled = false,
builderPackage = Constants.FABRIC8_KUBERNETES_API
Expand All @@ -29,6 +31,6 @@ public class KafkaBridgeAdminClientSpec extends KafkaBridgeClientSpec {
@Override
@Description("The Kafka AdminClient configuration used for AdminClient instances created by the bridge.")
public Map<String, Object> getConfig() {
return config;
return this.config != null ? this.config : emptyMap();
fvaleri marked this conversation as resolved.
Show resolved Hide resolved
}
}
5 changes: 2 additions & 3 deletions api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeClientSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@
@EqualsAndHashCode
@ToString
public abstract class KafkaBridgeClientSpec implements UnknownPropertyPreserving {
protected Map<String, Object> config = new HashMap<>(0);

protected Map<String, Object> config;
private Map<String, Object> additionalProperties;

public Map<String, Object> getConfig() {
return config;
return this.config != null ? this.config : emptyMap();
}

public void setConfig(Map<String, Object> config) {
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

import java.util.Map;

import static java.util.Collections.emptyMap;

@DescriptionFile
@Buildable(
editableEnabled = false,
Expand All @@ -36,7 +38,7 @@ public class KafkaBridgeConsumerSpec extends KafkaBridgeClientSpec {
@Override
@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 + ").")
public Map<String, Object> getConfig() {
return config;
return this.config != null ? this.config : emptyMap();
}

@JsonInclude(JsonInclude.Include.NON_DEFAULT)
Expand Down
9 changes: 7 additions & 2 deletions api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* A representation of the HTTP configuration.
*/
Expand All @@ -36,7 +38,7 @@ public class KafkaBridgeHttpConfig implements UnknownPropertyPreserving {
public static final String HTTP_DEFAULT_HOST = "0.0.0.0";
private int port = HTTP_DEFAULT_PORT;
private KafkaBridgeHttpCors cors;
private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

public KafkaBridgeHttpConfig() {
}
Expand Down Expand Up @@ -68,11 +70,14 @@ public void setCors(KafkaBridgeHttpCors cors) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}
}
9 changes: 7 additions & 2 deletions api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpCors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import java.util.List;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* A representation of the HTTP CORS configuration.
*/
Expand All @@ -32,7 +34,7 @@
public class KafkaBridgeHttpCors implements UnknownPropertyPreserving {
private List<String> allowedOrigins = null;
private List<String> allowedMethods = null;
private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

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

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}
}
4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

import java.util.Map;

import static java.util.Collections.emptyMap;

@DescriptionFile
@Buildable(
editableEnabled = false,
Expand All @@ -33,7 +35,7 @@ public class KafkaBridgeProducerSpec extends KafkaBridgeClientSpec {
@Override
@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 + ").")
public Map<String, Object> getConfig() {
return config;
return this.config != null ? this.config : emptyMap();
}

@JsonInclude(JsonInclude.Include.NON_DEFAULT)
Expand Down
9 changes: 7 additions & 2 deletions api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Representation of a template for Kafka Bridge resources.
*/
Expand All @@ -42,7 +44,7 @@ public class KafkaBridgeTemplate implements UnknownPropertyPreserving {
private ContainerTemplate initContainer;
private ResourceTemplate clusterRoleBinding;
private ResourceTemplate serviceAccount;
private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

@Description("Template for Kafka Bridge `Deployment`.")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -126,11 +128,14 @@ public void setServiceAccount(ResourceTemplate serviceAccount) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}
}
4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/common/CertAndKeySecretSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Represents a certificate and private key pair inside a Secret
*/
Expand Down Expand Up @@ -65,7 +67,7 @@ public void setKey(String key) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/common/CertSecretSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Represents a certificate inside a Secret
*/
Expand Down Expand Up @@ -67,7 +69,7 @@ public void setPattern(String pattern) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
Expand Down
11 changes: 8 additions & 3 deletions api/src/main/java/io/strimzi/api/kafka/model/common/CertificateAuthority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

@Description("Configuration of how TLS certificates are used within the cluster. " +
"This applies to certificates used for both internal communication within the cluster and to certificates " +
"used for client access via `Kafka.spec.kafka.listeners.tls`.")
Expand All @@ -34,7 +36,7 @@ public class CertificateAuthority implements UnknownPropertyPreserving {
private int renewalDays;
private CertificateExpirationPolicy certificateExpirationPolicy;

private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

public static final int DEFAULT_CERTS_VALIDITY_DAYS = 365;
public static final int DEFAULT_CERTS_RENEWAL_DAYS = 30;
Expand Down Expand Up @@ -100,14 +102,17 @@ public CertificateExpirationPolicy getCertificateExpirationPolicy() {
public void setCertificateExpirationPolicy(CertificateExpirationPolicy certificateExpirationPolicy) {
this.certificateExpirationPolicy = certificateExpirationPolicy;
}

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}
}
10 changes: 7 additions & 3 deletions api/src/main/java/io/strimzi/api/kafka/model/common/ContainerEnvVar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Representation for environment variables for Strimzi containers.
*/
Expand All @@ -29,7 +31,7 @@
public class ContainerEnvVar implements UnknownPropertyPreserving {
private String name;
private String value;
private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

@Description("The environment variable key.")
public String getName() {
Expand All @@ -51,12 +53,14 @@ public void setValue(String value) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}

}
1 change: 0 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/common/CustomResourceConditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
* </pre>
*/
public class CustomResourceConditions {

private CustomResourceConditions() {
}

Expand Down
10 changes: 7 additions & 3 deletions api/src/main/java/io/strimzi/api/kafka/model/common/ExternalConfigurationReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Representation for a value read from a given key of a config map in the same namespace as the referrer.
*/
Expand All @@ -29,7 +31,7 @@
@ToString
public class ExternalConfigurationReference implements UnknownPropertyPreserving {
private ConfigMapKeySelector configMapKeyRef;
private Map<String, Object> additionalProperties = new HashMap<>(0);
private Map<String, Object> additionalProperties;

@Description("Reference to the key in the ConfigMap containing the configuration.")
@KubeLink(group = "core", version = "v1", kind = "configmapkeyselector")
Expand All @@ -44,13 +46,15 @@ public void setConfigMapKeyRef(ConfigMapKeySelector configMapKeyRef) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
public void setAdditionalProperty(String name, Object value) {
if (this.additionalProperties == null) {
this.additionalProperties = new HashMap<>(1);
}
this.additionalProperties.put(name, value);
}

}

4 changes: 3 additions & 1 deletion api/src/main/java/io/strimzi/api/kafka/model/common/GenericSecretSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import java.util.HashMap;
import java.util.Map;

import static java.util.Collections.emptyMap;

/**
* Represents a generic secret inside a Kubernetes Secret
*/
Expand Down Expand Up @@ -54,7 +56,7 @@ public void setKey(String key) {

@Override
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
return this.additionalProperties != null ? this.additionalProperties : emptyMap();
}

@Override
Expand Down
Loading
Loading