[Microprofile] Set openApiNullable in configs to false

OpenAPITools · Nov 22, 2024 · 2a38a09 · 2a38a09
1 parent 2a92680
commit 2a38a09
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 132 deletions.
diff --git a/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml b/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
@@ -10,3 +10,4 @@ additionalProperties:
   microprofileRestClientVersion: "3.0"
   hideGenerationTimestamp: true
   useReflectionEqualsHashCode: true
+  openApiNullable: false
diff --git a/bin/configs/java-microprofile-rest-client-3.0.yaml b/bin/configs/java-microprofile-rest-client-3.0.yaml
@@ -7,3 +7,4 @@ additionalProperties:
   artifactId: microprofile-rest-client-3
   configKey: petstore
   microprofileRestClientVersion: "3.0"
+  openApiNullable: false
diff --git a/...est-client-3.0-jackson/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/...est-client-3.0-jackson/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.ParentWithNullable;
-import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -74,22 +73,11 @@ public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...profile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/...profile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -25,10 +25,6 @@
 import org.openapitools.client.model.OuterEnumDefaultValue;
 import org.openapitools.client.model.OuterEnumInteger;
 import org.openapitools.client.model.OuterEnumIntegerDefaultValue;
-import org.openapitools.jackson.nullable.JsonNullable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -403,22 +399,11 @@ public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...est-client-3.0-jackson/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/...est-client-3.0-jackson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -21,10 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.openapitools.jackson.nullable.JsonNullable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -70,22 +66,11 @@ public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...le-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/NullableClass.java b/...le-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -28,10 +28,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.openapitools.jackson.nullable.JsonNullable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -441,22 +437,11 @@ public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...st-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...st-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -24,10 +24,6 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.openapitools.jackson.nullable.JsonNullable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
@@ -140,22 +136,11 @@ public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...rofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/...rofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -15,7 +15,6 @@
 import java.util.Objects;
 import java.util.Arrays;
 import org.openapitools.client.model.ParentWithNullable;
-import org.openapitools.jackson.nullable.JsonNullable;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
 import jakarta.json.bind.annotation.JsonbTypeSerializer;
@@ -69,22 +68,11 @@ public boolean equals(Object o) {
         super.equals(o);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(otherProperty, super.hashCode());
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...va/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java b/...va/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -18,7 +18,6 @@
 import org.openapitools.client.model.OuterEnumDefaultValue;
 import org.openapitools.client.model.OuterEnumInteger;
 import org.openapitools.client.model.OuterEnumIntegerDefaultValue;
-import org.openapitools.jackson.nullable.JsonNullable;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
 import jakarta.json.bind.annotation.JsonbTypeSerializer;
@@ -407,22 +406,11 @@ public boolean equals(Object o) {
         Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...rofile-rest-client-3.0/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/...rofile-rest-client-3.0/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -14,7 +14,6 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import org.openapitools.jackson.nullable.JsonNullable;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
 import jakarta.json.bind.annotation.JsonbTypeSerializer;
@@ -70,22 +69,11 @@ public boolean equals(Object o) {
     return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(nullableMessage);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...croprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/NullableClass.java b/...croprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.openapitools.jackson.nullable.JsonNullable;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
 import jakarta.json.bind.annotation.JsonbTypeSerializer;
@@ -387,22 +386,11 @@ public boolean equals(Object o) {
         super.equals(o);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode());
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */

diff --git a/...ofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...ofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -14,7 +14,6 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import org.openapitools.jackson.nullable.JsonNullable;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
 import jakarta.json.bind.annotation.JsonbTypeSerializer;
@@ -135,22 +134,11 @@ public boolean equals(Object o) {
         Objects.equals(this.nullableProperty, parentWithNullable.nullableProperty);
   }
 
-  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
-    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
-  }
-
   @Override
   public int hashCode() {
     return Objects.hash(type, nullableProperty);
   }
 
-  private static <T> int hashCodeNullable(JsonNullable<T> a) {
-    if (a == null) {
-      return 1;
-    }
-    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
-  }
-
   /**
    * Create a string representation of this pojo.
    */