Polishing.

See gh-661
Original pull request: gh-793

Author: mp911de

spring-vault-core/src/main/java/org/springframework/vault/core/VaultTransitTemplate.java

@@ -57,6 +57,7 @@
  * @author Luander Ribeiro
  * @author Mikko Koli
  * @author My-Lan Aragon
+ * @author Nanne Baars
  */
 public class VaultTransitTemplate implements VaultTransitOperations {
 
@@ -559,13 +560,19 @@ static class VaultTransitKeyImpl implements VaultTransitKey {
 		@Nullable
 		private String name;
 
-		@JsonProperty("cipher_mode")
-		private String cipherMode = "";
-
 		@JsonProperty("type")
 		@Nullable
 		private String type;
 
+		@JsonProperty("allow_plaintext_backup")
+		private boolean allowPlaintextBackup;
+
+		@JsonProperty("cipher_mode")
+		private String cipherMode = "";
+
+		@JsonProperty("convergent_encryption_version")
+		private int convergentVersion;
+
 		@JsonProperty("deletion_allowed")
 		private boolean deletionAllowed;
 
@@ -584,28 +591,32 @@ static class VaultTransitKeyImpl implements VaultTransitKey {
 		@JsonProperty("min_encryption_version")
 		private int minEncryptionVersion;
 
+		@JsonProperty("convergent_encryption")
+		private boolean supportsConvergentEncryption;
+
 		@JsonProperty("supports_decryption")
 		private boolean supportsDecryption;
 
-		@JsonProperty("supports_encryption")
-		private boolean supportsEncryption;
-
 		@JsonProperty("supports_derivation")
 		private boolean supportsDerivation;
 
+		@JsonProperty("supports_encryption")
+		private boolean supportsEncryption;
+
 		@JsonProperty("supports_signing")
 		private boolean supportsSigning;
 
-		@JsonProperty("allow_plaintext_backup")
-		private boolean allowPlaintextBackup;
-
-		@JsonProperty("convergent_encryption")
-		private boolean supportsConvergentEncryption;
+		public VaultTransitKeyImpl() {
+		}
 
-		@JsonProperty("convergent_encryption_version")
-		private int convergentVersion;
+		@Override
+		@Nullable
+		public String getName() {
+			return this.name;
+		}
 
-		public VaultTransitKeyImpl() {
+		public void setName(@Nullable String name) {
+			this.name = name;
 		}
 
 		@Override
@@ -618,166 +629,165 @@ public String getType() {
 			return this.cipherMode;
 		}
 
-		@Override
-		public boolean supportsDecryption() {
-			return isSupportsDecryption();
-		}
-
-		@Override
-		public boolean supportsEncryption() {
-			return isSupportsEncryption();
+		public void setType(@Nullable String type) {
+			this.type = type;
 		}
 
 		@Override
-		public boolean supportsDerivation() {
-			return isSupportsDerivation();
+		public boolean allowPlaintextBackup() {
+			return isAllowPlaintextBackup();
 		}
 
-		@Override
-		public boolean supportsSigning() {
-			return isSupportsSigning();
+		public boolean isAllowPlaintextBackup() {
+			return this.allowPlaintextBackup;
 		}
 
-		@Override
-		public boolean allowPlaintextBackup() {
-			return isAllowPlaintextBackup();
+		public String getCipherMode() {
+			return this.cipherMode;
 		}
 
-		@Override
-		public boolean supportsConvergentEncryption() {
-			return isSupportsConvergentEncryption();
+		public void setCipherMode(String cipherMode) {
+			this.cipherMode = cipherMode;
 		}
 
 		@Override
 		public int getConvergentVersion() {
 			return this.convergentVersion;
 		}
 
-		@Nullable
-		public String getName() {
-			return this.name;
-		}
-
-		public String getCipherMode() {
-			return this.cipherMode;
-		}
-
+		@Override
 		public boolean isDeletionAllowed() {
 			return this.deletionAllowed;
 		}
 
+		public void setDeletionAllowed(boolean deletionAllowed) {
+			this.deletionAllowed = deletionAllowed;
+		}
+
+		@Override
 		public boolean isDerived() {
 			return this.derived;
 		}
 
+		public void setDerived(boolean derived) {
+			this.derived = derived;
+		}
+
+		@Override
 		public boolean isExportable() {
 			return this.exportable;
 		}
 
+		public void setExportable(boolean exportable) {
+			this.exportable = exportable;
+		}
+
+		@Override
 		public Map<String, Object> getKeys() {
 			return this.keys;
 		}
 
-		public int getLatestVersion() {
-			return this.latestVersion;
+		public void setKeys(Map<String, Object> keys) {
+			this.keys = keys;
 		}
 
-		public int getMinDecryptionVersion() {
-			return this.minDecryptionVersion;
+		@Override
+		public int getLatestVersion() {
+			return this.latestVersion;
 		}
 
-		public int getMinEncryptionVersion() {
-			return this.minEncryptionVersion;
+		public void setLatestVersion(int latestVersion) {
+			this.latestVersion = latestVersion;
 		}
 
-		public boolean isAllowPlaintextBackup() {
-			return this.allowPlaintextBackup;
+		@Override
+		public int getMinDecryptionVersion() {
+			return this.minDecryptionVersion;
 		}
 
-		public boolean isSupportsDecryption() {
-			return this.supportsDecryption;
+		public void setMinDecryptionVersion(int minDecryptionVersion) {
+			this.minDecryptionVersion = minDecryptionVersion;
 		}
 
-		public boolean isSupportsEncryption() {
-			return this.supportsEncryption;
+		public void setSupportsEncryption(boolean supportsEncryption) {
+			this.supportsEncryption = supportsEncryption;
 		}
 
-		public boolean isSupportsDerivation() {
-			return this.supportsDerivation;
+		@Override
+		public int getMinEncryptionVersion() {
+			return this.minEncryptionVersion;
 		}
 
-		public boolean isSupportsSigning() {
-			return this.supportsSigning;
+		public void setMinEncryptionVersion(int minEncryptionVersion) {
+			this.minEncryptionVersion = minEncryptionVersion;
 		}
 
 		public boolean isSupportsConvergentEncryption() {
 			return this.supportsConvergentEncryption;
 		}
 
-		public void setName(@Nullable String name) {
-			this.name = name;
-		}
-
-		public void setCipherMode(String cipherMode) {
-			this.cipherMode = cipherMode;
-		}
-
-		public void setType(@Nullable String type) {
-			this.type = type;
-		}
-
-		public void setDeletionAllowed(boolean deletionAllowed) {
-			this.deletionAllowed = deletionAllowed;
-		}
-
-		public void setDerived(boolean derived) {
-			this.derived = derived;
+		@Override
+		public boolean supportsConvergentEncryption() {
+			return isSupportsConvergentEncryption();
 		}
 
-		public void setExportable(boolean exportable) {
-			this.exportable = exportable;
+		public boolean isSupportsDecryption() {
+			return this.supportsDecryption;
 		}
 
-		public void setKeys(Map<String, Object> keys) {
-			this.keys = keys;
+		@Override
+		public boolean supportsDecryption() {
+			return isSupportsDecryption();
 		}
 
-		public void setLatestVersion(int latestVersion) {
-			this.latestVersion = latestVersion;
+		public void setSupportsDecryption(boolean supportsDecryption) {
+			this.supportsDecryption = supportsDecryption;
 		}
 
-		public void setMinDecryptionVersion(int minDecryptionVersion) {
-			this.minDecryptionVersion = minDecryptionVersion;
+		public boolean isSupportsEncryption() {
+			return this.supportsEncryption;
 		}
 
-		public void setMinEncryptionVersion(int minEncryptionVersion) {
-			this.minEncryptionVersion = minEncryptionVersion;
+		@Override
+		public boolean supportsEncryption() {
+			return isSupportsEncryption();
 		}
 
-		public void setSupportsDecryption(boolean supportsDecryption) {
-			this.supportsDecryption = supportsDecryption;
+		@Override
+		public boolean supportsDerivation() {
+			return isSupportsDerivation();
 		}
 
-		public void setSupportsEncryption(boolean supportsEncryption) {
-			this.supportsEncryption = supportsEncryption;
+		public boolean isSupportsDerivation() {
+			return this.supportsDerivation;
 		}
 
 		public void setSupportsDerivation(boolean supportsDerivation) {
 			this.supportsDerivation = supportsDerivation;
 		}
 
+		public boolean isSupportsSigning() {
+			return this.supportsSigning;
+		}
+
 		public void setSupportsSigning(boolean supportsSigning) {
 			this.supportsSigning = supportsSigning;
 		}
 
+		@Override
+		public boolean supportsSigning() {
+			return isSupportsSigning();
+		}
+
 		@Override
 		public boolean equals(Object o) {
 			if (this == o)
 				return true;
 			if (!(o instanceof VaultTransitKeyImpl))
 				return false;
 			VaultTransitKeyImpl that = (VaultTransitKeyImpl) o;
-			return this.deletionAllowed == that.deletionAllowed && this.derived == that.derived
+			return this.allowPlaintextBackup == that.allowPlaintextBackup
+					&& this.deletionAllowed == that.deletionAllowed && this.derived == that.derived
 					&& this.exportable == that.exportable && this.latestVersion == that.latestVersion
 					&& this.minDecryptionVersion == that.minDecryptionVersion
 					&& this.minEncryptionVersion == that.minEncryptionVersion
@@ -786,17 +796,15 @@ public boolean equals(Object o) {
 					&& this.supportsDerivation == that.supportsDerivation
 					&& this.supportsSigning == that.supportsSigning && Objects.equals(this.name, that.name)
 					&& this.cipherMode.equals(that.cipherMode) && Objects.equals(this.type, that.type)
-					&& this.allowPlaintextBackup == that.allowPlaintextBackup
 					&& this.supportsConvergentEncryption == that.supportsConvergentEncryption;
 		}
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(this.name, this.cipherMode, this.type, this.deletionAllowed, this.derived,
-					this.exportable, this.keys, this.latestVersion, this.minDecryptionVersion,
+			return Objects.hash(this.allowPlaintextBackup, this.name, this.cipherMode, this.type, this.deletionAllowed,
+					this.derived, this.exportable, this.keys, this.latestVersion, this.minDecryptionVersion,
 					this.minEncryptionVersion, this.supportsDecryption, this.supportsEncryption,
-					this.supportsDerivation, this.supportsSigning, this.allowPlaintextBackup,
-					this.supportsConvergentEncryption);
+					this.supportsDerivation, this.supportsSigning, this.supportsConvergentEncryption);
 		}
 
 	}
@@ -811,10 +819,12 @@ static class RawTransitKeyImpl implements RawTransitKey {
 		public RawTransitKeyImpl() {
 		}
 
+		@Override
 		public Map<String, String> getKeys() {
 			return this.keys;
 		}
 
+		@Override
 		@Nullable
 		public String getName() {
 			return this.name;