Merge "[OOM-CERT-SERVICE] Refactor CmpResponseValidationHelper"

diff --combined certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
index e73f57d,93c6047..0421e9c
--- 1/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
--- 2/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
+++ b/certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
@@@ -1,7 -1,8 +1,7 @@@
  /*-
   * ============LICENSE_START=======================================================
   * Copyright (C) 2020 Nordix Foundation.
 - * ================================================================================
 - * Modification copyright 2021 Nokia
 + * Copyright (C) 2021 Nokia.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -42,9 -43,9 +42,9 @@@ import java.util.Date
  import java.util.Objects;
  import java.util.Optional;
  
- import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.checkImplicitConfirm;
- import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifyPasswordBasedProtection;
- import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifySignature;
+ import static org.onap.oom.certservice.cmpv2client.validation.CmpResponseValidationHelper.checkImplicitConfirm;
+ import static org.onap.oom.certservice.cmpv2client.validation.CmpResponseValidationHelper.verifyPasswordBasedProtection;
+ import static org.onap.oom.certservice.cmpv2client.validation.CmpResponseValidationHelper.verifySignature;
  
  public class CmpCertificationValidator {
      private static final String DEFAULT_CA_NAME = "Certification Authority";
@@@ -74,7 -75,6 +74,7 @@@
          if (notBefore != null && notAfter != null && notBefore.compareTo(notAfter) > 0) {
              throw new IllegalArgumentException("Before Date is set after the After Date");
          }
 +        LOG.info("Validation completed successfully.");
      }
  
      public void checkCmpResponse(final PKIMessage respPkiMessage, final PublicKey publicKey, final String initAuthPassword)
@@@ -127,7 -127,9 +127,7 @@@
      }
  
      private void logServerResponse(CertResponse certResponse) {
 -        if (LOG.isInfoEnabled()) {
 -            LOG.info("Response status code: {}", certResponse.getStatus().getStatus());
 -        }
 +        LOG.info("Response status code: {}", certResponse.getStatus().getStatus());
          if (certResponse.getStatus().getStatusString() != null) {
              String serverMessage = certResponse.getStatus().getStatusString().getStringAt(0).getString();
              LOG.warn("Response status text: {}", serverMessage);