Merge "[OOM-CERT-SERVICE] Refactor CertService API code"

diff --cc certService/src/main/java/org/onap/oom/certservice/cmpv2client/impl/CmpClientImpl.java
Simple merge

diff --cc certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
index 4abfac9,b9a04a4..c5d6f3e
--- 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
@@@ -45,8 -39,18 +38,17 @@@ import org.onap.oom.certservice.cmpv2cl
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
+ import java.security.PublicKey;
+ 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;
+ 
  public class CmpCertificationValidator {
      private static final String DEFAULT_CA_NAME = "Certification Authority";
 -    private static final String DEFAULT_PROFILE = CaMode.RA.getProfile();
      private static final ASN1ObjectIdentifier PASSWORD_BASED_MAC = new ASN1ObjectIdentifier("1.2.840.113533.7.66.13");
      private static final Logger LOG = LoggerFactory.getLogger(CmpCertificationValidator.class);