Clean up boolean values in records

Remove unnecessary boolean values in record and
the rest change to Boolean, so it can be null.

JIRA: NETCONF-938
Change-Id: Ieaadb216c23b9aea5bf682e914a554daf39907ff
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Operation.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Operation.java
index 318a1873087dea8e9443a9857c16774f4c984de7..7fde87ffceb0abdaff8dc686a584c1f0dfd9407b 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Operation.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Operation.java
@@ -13,7 +13,7 @@ import java.util.Map;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record Operation(
-        boolean deprecated,
+        Boolean deprecated,
         List<String> tags,
         List<Parameter> parameters,
         List<Map<String, List<String>>> security,
@@ -43,7 +43,7 @@ public record Operation(
 
     @SuppressWarnings("checkstyle:hiddenField")
     public static class Builder {
-        private boolean deprecated;
+        private Boolean deprecated;
         private List<String> tags;
         private List<Parameter> parameters;
         private List<Map<String, List<String>>> security;
@@ -56,7 +56,7 @@ public record Operation(
         private String operationId;
         private String summary;
 
-        public Builder deprecated(final boolean deprecated) {
+        public Builder deprecated(final Boolean deprecated) {
             this.deprecated = deprecated;
             return this;
         }

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Property.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Property.java
index a6f1e0142241ccbff27c11c11840ed0e4cf67e2d..a860030de6df588c4e259d7a5fc5dc4f37c87fbe 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Property.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Property.java
@@ -25,7 +25,7 @@ public record Property(
         @JsonProperty("$ref") @Nullable String ref,
         @Nullable Integer minItems,
         @Nullable Integer maxItems,
-        boolean uniqueItems,
+        @Nullable Boolean uniqueItems,
         @JsonProperty("enum") List<String> enums,
         @Nullable Integer minLength,
         @Nullable Integer maxLength) {
@@ -53,7 +53,7 @@ public record Property(
         private String ref;
         private Integer minItems;
         private Integer maxItems;
-        private boolean uniqueItems;
+        private Boolean uniqueItems;
         private List<String> enums;
         private Integer minLength;
         private Integer maxLength;
@@ -113,7 +113,7 @@ public record Property(
             return this;
         }
 
-        public Builder uniqueItems(final boolean uniqueItems) {
+        public Builder uniqueItems(final Boolean uniqueItems) {
             this.uniqueItems = uniqueItems;
             return this;
         }

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/RequestBody.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/RequestBody.java
index 6682ddf48a602b978b7fb820a00079039cbec514..40f8c6253eafb407f13c43589fd783a0c6414bb1 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/RequestBody.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/RequestBody.java
@@ -17,7 +17,7 @@ import org.eclipse.jdt.annotation.Nullable;
 public record RequestBody(
         @Nullable String description,
         @NonNull Map<String, MediaTypeObject> content,
-        boolean required) {
+        @Nullable Boolean required) {
 
     public RequestBody {
         content = Map.copyOf(Objects.requireNonNull(content));
@@ -31,7 +31,7 @@ public record RequestBody(
     public static class Builder {
         private String description;
         private Map<String, MediaTypeObject> content;
-        private boolean required;
+        private Boolean required;
 
         public Builder description(final String description) {
             this.description = description;
@@ -43,7 +43,7 @@ public record RequestBody(
             return this;
         }
 
-        public Builder required(final boolean required) {
+        public Builder required(final Boolean required) {
             this.required = required;
             return this;
         }

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Xml.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Xml.java
index 2c5a086109775d83ae027c7e220e5042f1ead4f6..60c4c5f9fc8cd4cc7dfe62c29ec7f59db86dac83 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Xml.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/Xml.java
@@ -14,11 +14,5 @@ import org.eclipse.jdt.annotation.Nullable;
 public record Xml(
         @Nullable String name,
         @Nullable String namespace,
-        @Nullable String prefix,
-        boolean attribute,
-        boolean wrapped) {
-
-    public Xml(@Nullable final String name, @Nullable final String namespace, @Nullable final String prefix) {
-        this(name, namespace, prefix, false, false);
-    }
+        @Nullable String prefix) {
 }