Confirmations should implement Confirmation instead of Request

Author: Mathias Oben

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/CertificateSignedConfirmation.java

@@ -26,13 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.CertificateSignedStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class CertificateSignedConfirmation implements Request {
+public class CertificateSignedConfirmation implements Confirmation {
 
   private CertificateSignedStatusEnumType status;
 
@@ -63,11 +63,6 @@ public void setStatus(CertificateSignedStatusEnumType status) {
     this.status = status;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/DeleteCertificateConfirmation.java

@@ -26,13 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.DeleteCertificateStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class DeleteCertificateConfirmation implements Request {
+public class DeleteCertificateConfirmation implements Confirmation {
 
   private DeleteCertificateStatusEnumType status;
 
@@ -63,11 +63,6 @@ public void setStatus(DeleteCertificateStatusEnumType status) {
     this.status = status;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/ExtendedTriggerMessageConfirmation.java

@@ -26,13 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.TriggerMessageStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class ExtendedTriggerMessageConfirmation implements Request {
+public class ExtendedTriggerMessageConfirmation implements Confirmation {
 
   private TriggerMessageStatusEnumType status;
 
@@ -63,11 +63,6 @@ public void setStatus(TriggerMessageStatusEnumType status) {
     this.status = status;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/GetInstalledCertificateIdsConfirmation.java

@@ -26,15 +26,15 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.CertificateHashDataType;
 import eu.chargetime.ocpp.model.securityext.types.GetInstalledCertificateStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Arrays;
 import java.util.Objects;
 
-public class GetInstalledCertificateIdsConfirmation implements Request {
+public class GetInstalledCertificateIdsConfirmation implements Confirmation {
 
   private GetInstalledCertificateStatusEnumType status;
   private CertificateHashDataType[] certificateHashData;
@@ -84,11 +84,6 @@ public void setCertificateHashData(CertificateHashDataType[] certificateHashData
     this.certificateHashData = certificateHashData;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null && validateCertificateHashData();

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/GetLogConfirmation.java

@@ -26,18 +26,16 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.LogStatusEnumType;
-import eu.chargetime.ocpp.model.validation.OCPPSecurityExtDatatypes;
 import eu.chargetime.ocpp.model.validation.StringMaxLengthValidationRule;
 import eu.chargetime.ocpp.model.validation.Validator;
 import eu.chargetime.ocpp.model.validation.ValidatorBuilder;
-import eu.chargetime.ocpp.utilities.ModelUtil;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class GetLogConfirmation implements Request {
+public class GetLogConfirmation implements Confirmation {
 
   private static final transient Validator filenameValidator =
     new ValidatorBuilder()
@@ -97,11 +95,6 @@ public void setFilename(String filename) {
     this.filename = filename;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null && filenameValidator.safeValidate(filename);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/InstallCertificateConfirmation.java

@@ -26,13 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.CertificateStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class InstallCertificateConfirmation implements Request {
+public class InstallCertificateConfirmation implements Confirmation {
 
   private CertificateStatusEnumType status;
 
@@ -63,11 +63,6 @@ public void setStatus(CertificateStatusEnumType status) {
     this.status = status;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/LogStatusNotificationConfirmation.java

@@ -26,17 +26,12 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class LogStatusNotificationConfirmation implements Request {
-
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
+public class LogStatusNotificationConfirmation implements Confirmation {
 
   @Override
   public boolean validate() {

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/SecurityEventNotificationConfirmation.java

@@ -26,17 +26,12 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class SecurityEventNotificationConfirmation implements Request {
-
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
+public class SecurityEventNotificationConfirmation implements Confirmation {
 
   @Override
   public boolean validate() {

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/SignCertificateConfirmation.java

@@ -26,13 +26,13 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.securityext.types.GenericStatusEnumType;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class SignCertificateConfirmation implements Request {
+public class SignCertificateConfirmation implements Confirmation {
 
   private GenericStatusEnumType status;
 
@@ -63,11 +63,6 @@ public void setStatus(GenericStatusEnumType status) {
     this.status = status;
   }
 
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
-
   @Override
   public boolean validate() {
     return status != null;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/securityext/SignedFirmwareStatusNotificationConfirmation.java

@@ -26,17 +26,12 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import java.util.Objects;
 
-public class SignedFirmwareStatusNotificationConfirmation implements Request {
-
-  @Override
-  public boolean transactionRelated() {
-    return false;
-  }
+public class SignedFirmwareStatusNotificationConfirmation implements Confirmation {
 
   @Override
   public boolean validate() {