m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/BeaconVersion.java

@@ -15,7 +15,7 @@ public class BeaconVersion {
   /**
    * The version of searchable encryption configured. This must be '1'.
    */
-  private final int version;
+  private final Integer version;
 
   /**
    * The Key Store that contains the Beacon Keys to use with searchable encryption.
@@ -66,7 +66,7 @@ protected BeaconVersion(BuilderImpl builder) {
   /**
    * @return The version of searchable encryption configured. This must be '1'.
    */
-  public int version() {
+  public Integer version() {
     return this.version;
   }
 
@@ -131,12 +131,12 @@ public interface Builder {
     /**
      * @param version The version of searchable encryption configured. This must be '1'.
      */
-    Builder version(int version);
+    Builder version(Integer version);
 
     /**
      * @return The version of searchable encryption configured. This must be '1'.
      */
-    int version();
+    Integer version();
 
     /**
      * @param keyStore The Key Store that contains the Beacon Keys to use with searchable encryption.
@@ -213,9 +213,7 @@ public interface Builder {
 
   static class BuilderImpl implements Builder {
 
-    protected int version;
-
-    private boolean _versionSet = false;
+    protected Integer version;
 
     protected KeyStore keyStore;
 
@@ -235,7 +233,6 @@ protected BuilderImpl() {}
 
     protected BuilderImpl(BeaconVersion model) {
       this.version = model.version();
-      this._versionSet = true;
       this.keyStore = model.keyStore();
       this.keySource = model.keySource();
       this.standardBeacons = model.standardBeacons();
@@ -245,13 +242,12 @@ protected BuilderImpl(BeaconVersion model) {
       this.signedParts = model.signedParts();
     }
 
-    public Builder version(int version) {
+    public Builder version(Integer version) {
       this.version = version;
-      this._versionSet = true;
       return this;
     }
 
-    public int version() {
+    public Integer version() {
       return this.version;
     }
 
@@ -319,12 +315,12 @@ public List<SignedPart> signedParts() {
     }
 
     public BeaconVersion build() {
-      if (!this._versionSet) {
+      if (Objects.isNull(this.version())) {
         throw new IllegalArgumentException(
           "Missing value for required field `version`"
         );
       }
-      if (this._versionSet && this.version() < 1) {
+      if (Objects.nonNull(this.version()) && this.version() < 1) {
         throw new IllegalArgumentException(
           "`version` must be greater than or equal to 1"
         );

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/SearchConfig.java

@@ -19,7 +19,7 @@ public class SearchConfig {
   /**
    * The searchable encryption version to use when writing new items. Must be '1'.
    */
-  private final int writeVersion;
+  private final Integer writeVersion;
 
   protected SearchConfig(BuilderImpl builder) {
     this.versions = builder.versions();
@@ -36,7 +36,7 @@ public List<BeaconVersion> versions() {
   /**
    * @return The searchable encryption version to use when writing new items. Must be '1'.
    */
-  public int writeVersion() {
+  public Integer writeVersion() {
     return this.writeVersion;
   }
 
@@ -62,12 +62,12 @@ public interface Builder {
     /**
      * @param writeVersion The searchable encryption version to use when writing new items. Must be '1'.
      */
-    Builder writeVersion(int writeVersion);
+    Builder writeVersion(Integer writeVersion);
 
     /**
      * @return The searchable encryption version to use when writing new items. Must be '1'.
      */
-    int writeVersion();
+    Integer writeVersion();
 
     SearchConfig build();
   }
@@ -76,16 +76,13 @@ static class BuilderImpl implements Builder {
 
     protected List<BeaconVersion> versions;
 
-    protected int writeVersion;
-
-    private boolean _writeVersionSet = false;
+    protected Integer writeVersion;
 
     protected BuilderImpl() {}
 
     protected BuilderImpl(SearchConfig model) {
       this.versions = model.versions();
       this.writeVersion = model.writeVersion();
-      this._writeVersionSet = true;
     }
 
     public Builder versions(List<BeaconVersion> versions) {
@@ -97,13 +94,12 @@ public List<BeaconVersion> versions() {
       return this.versions;
     }
 
-    public Builder writeVersion(int writeVersion) {
+    public Builder writeVersion(Integer writeVersion) {
       this.writeVersion = writeVersion;
-      this._writeVersionSet = true;
       return this;
     }
 
-    public int writeVersion() {
+    public Integer writeVersion() {
       return this.writeVersion;
     }
 
@@ -123,12 +119,12 @@ public SearchConfig build() {
           "The size of `versions` must be less than or equal to 1"
         );
       }
-      if (!this._writeVersionSet) {
+      if (Objects.isNull(this.writeVersion())) {
         throw new IllegalArgumentException(
           "Missing value for required field `writeVersion`"
         );
       }
-      if (this._writeVersionSet && this.writeVersion() < 1) {
+      if (Objects.nonNull(this.writeVersion()) && this.writeVersion() < 1) {
         throw new IllegalArgumentException(
           "`writeVersion` must be greater than or equal to 1"
         );

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/model/StandardBeacon.java

@@ -18,7 +18,7 @@ public class StandardBeacon {
   /**
    * The length of the calculated beacon.
    */
-  private final int length;
+  private final Integer length;
 
   /**
    * The DynamoDB document path to the value this beacon will calculate over. If not specified, the beacon will calculate values for the attribute with the name specified in 'name'.
@@ -47,7 +47,7 @@ public String name() {
   /**
    * @return The length of the calculated beacon.
    */
-  public int length() {
+  public Integer length() {
     return this.length;
   }
 
@@ -87,12 +87,12 @@ public interface Builder {
     /**
      * @param length The length of the calculated beacon.
      */
-    Builder length(int length);
+    Builder length(Integer length);
 
     /**
      * @return The length of the calculated beacon.
      */
-    int length();
+    Integer length();
 
     /**
      * @param loc The DynamoDB document path to the value this beacon will calculate over. If not specified, the beacon will calculate values for the attribute with the name specified in 'name'.
@@ -121,9 +121,7 @@ static class BuilderImpl implements Builder {
 
     protected String name;
 
-    protected int length;
-
-    private boolean _lengthSet = false;
+    protected Integer length;
 
     protected String loc;
 
@@ -134,7 +132,6 @@ protected BuilderImpl() {}
     protected BuilderImpl(StandardBeacon model) {
       this.name = model.name();
       this.length = model.length();
-      this._lengthSet = true;
       this.loc = model.loc();
       this.style = model.style();
     }
@@ -148,13 +145,12 @@ public String name() {
       return this.name;
     }
 
-    public Builder length(int length) {
+    public Builder length(Integer length) {
       this.length = length;
-      this._lengthSet = true;
       return this;
     }
 
-    public int length() {
+    public Integer length() {
       return this.length;
     }
 
@@ -182,17 +178,17 @@ public StandardBeacon build() {
           "Missing value for required field `name`"
         );
       }
-      if (!this._lengthSet) {
+      if (Objects.isNull(this.length())) {
         throw new IllegalArgumentException(
           "Missing value for required field `length`"
         );
       }
-      if (this._lengthSet && this.length() < 1) {
+      if (Objects.nonNull(this.length()) && this.length() < 1) {
         throw new IllegalArgumentException(
           "`length` must be greater than or equal to 1"
         );
       }
-      if (this._lengthSet && this.length() > 63) {
+      if (Objects.nonNull(this.length()) && this.length() > 63) {
         throw new IllegalArgumentException(
           "`length` must be less than or equal to 63."
         );

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ResolveAttributesInput.java

@@ -22,7 +22,7 @@ public class ResolveAttributesInput {
   /**
    * The beacon version to use. Defaults to 'writeVersion'.
    */
-  private final int Version;
+  private final Integer Version;
 
   protected ResolveAttributesInput(BuilderImpl builder) {
     this.TableName = builder.TableName();
@@ -47,7 +47,7 @@ public Map<String, AttributeValue> Item() {
   /**
    * @return The beacon version to use. Defaults to 'writeVersion'.
    */
-  public int Version() {
+  public Integer Version() {
     return this.Version;
   }
 
@@ -83,12 +83,12 @@ public interface Builder {
     /**
      * @param Version The beacon version to use. Defaults to 'writeVersion'.
      */
-    Builder Version(int Version);
+    Builder Version(Integer Version);
 
     /**
      * @return The beacon version to use. Defaults to 'writeVersion'.
      */
-    int Version();
+    Integer Version();
 
     ResolveAttributesInput build();
   }
@@ -99,17 +99,14 @@ static class BuilderImpl implements Builder {
 
     protected Map<String, AttributeValue> Item;
 
-    protected int Version;
-
-    private boolean _VersionSet = false;
+    protected Integer Version;
 
     protected BuilderImpl() {}
 
     protected BuilderImpl(ResolveAttributesInput model) {
       this.TableName = model.TableName();
       this.Item = model.Item();
       this.Version = model.Version();
-      this._VersionSet = true;
     }
 
     public Builder TableName(String TableName) {
@@ -130,13 +127,12 @@ public Map<String, AttributeValue> Item() {
       return this.Item;
     }
 
-    public Builder Version(int Version) {
+    public Builder Version(Integer Version) {
       this.Version = Version;
-      this._VersionSet = true;
       return this;
     }
 
-    public int Version() {
+    public Integer Version() {
       return this.Version;
     }
 
@@ -163,7 +159,7 @@ public ResolveAttributesInput build() {
           "Missing value for required field `Item`"
         );
       }
-      if (this._VersionSet && this.Version() < 1) {
+      if (Objects.nonNull(this.Version()) && this.Version() < 1) {
         throw new IllegalArgumentException(
           "`Version` must be greater than or equal to 1"
         );