Merge "[OOM-CERT-SERVICE] Fix sonar and checkstyle issues, code cleanup"

diff --combined certService/src/main/java/org/onap/oom/certservice/cmpv2client/validation/CmpCertificationValidator.java
index 0d908be,f2601b9..4abfac9
--- 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
@@@ -36,6 -36,7 +36,6 @@@ import org.bouncycastle.asn1.cmp.CertRe
  import org.bouncycastle.asn1.cmp.PKIHeader;
  import org.bouncycastle.asn1.cmp.PKIMessage;
  import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 -import org.onap.oom.certservice.certification.configuration.model.CaMode;
  import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
  import org.onap.oom.certservice.certification.model.CsrModel;
  import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
@@@ -47,10 -48,11 +47,10 @@@ import org.slf4j.LoggerFactory
  
  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);
  
-     public static void validate(
+     public void validate(
          final CsrModel csrModel,
          final Cmpv2Server server,
          final CloseableHttpClient httpClient,
@@@ -58,8 -60,9 +58,8 @@@
          final Date notAfter) {
  
          String caName = CmpUtil.isNullOrEmpty(server.getCaName()) ? server.getCaName() : DEFAULT_CA_NAME;
 -        String profile = server.getCaMode() != null ? server.getCaMode().getProfile() : DEFAULT_PROFILE;
          LOG.info(
 -            "Validate before creating Certificate Request for CA :{} in Mode {} ", caName, profile);
 +            "Validate before creating Certificate Request for CA: {}", caName);
  
          CmpUtil.notNull(csrModel, "CsrModel Instance");
          CmpUtil.notNull(csrModel.getSubjectData(), "Subject DN");