Remove CSRMeta class dependency

Signed-off-by: Michal Banka <michal.banka@nokia.com>
Change-Id: If3458612629dd84f95bf9ba1e0778e65696bb13d
Issue-ID: AAF-1107

1 files changed, 54 insertions, 49 deletions

diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java
index 8f9d20bd..7de3b712 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/api/CmpClient.java
@@ -24,8 +24,9 @@ import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.List;
 
+import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.aaf.certservice.certification.model.CsrModel;
 import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.external.CsrMeta;
 
 /**
  * This class represent CmpV2Client Interface for obtaining X.509 Digital Certificates in a Public
@@ -34,53 +35,57 @@ import org.onap.aaf.certservice.cmpv2client.external.CsrMeta;
  */
 public interface CmpClient {
 
-    /**
-     * Requests for a External Root CA Certificate to be created for the passed public keyPair wrapped
-     * in a CSRMeta with common details, accepts self-signed certificate. Basic Authentication using
-     * IAK/RV, Verification of the signature (proof-of-possession) on the request is performed and an
-     * Exception thrown if verification fails or issue encountered in fetching certificate from CA.
-     *
-     * @param caName    Information about the External Root Certificate Authority (CA) performing the
-     *                  event CA Name. Could be {@code null}.
-     * @param profile   Profile on CA server Client/RA Mode configuration on Server. Could be {@code
-     *                  null}.
-     * @param csrMeta   Certificate Signing Request Meta Data. Must not be {@code null}.
-     * @param csr       Certificate Signing Request {.cer} file. Must not be {@code null}.
-     * @param notBefore An optional validity to set in the created certificate, Certificate not valid
-     *                  before this date.
-     * @param notAfter  An optional validity to set in the created certificate, Certificate not valid
-     *                  after this date.
-     * @return {@link X509Certificate} The newly created Certificate.
-     * @throws CmpClientException if client error occurs.
-     */
-    List<List<X509Certificate>> createCertificate(
-            String caName,
-            String profile,
-            CsrMeta csrMeta,
-            X509Certificate csr,
-            Date notBefore,
-            Date notAfter)
-            throws CmpClientException;
+  /**
+   * Requests for a External Root CA Certificate to be created for the passed public keyPair wrapped
+   * in a CSRMeta with common details, accepts self-signed certificate. Basic Authentication using
+   * IAK/RV, Verification of the signature (proof-of-possession) on the request is performed and an
+   * Exception thrown if verification fails or issue encountered in fetching certificate from CA.
+   *
+   * @param caName    Information about the External Root Certificate Authority (CA) performing the
+   *                  event CA Name. Could be {@code null}.
+   * @param profile   Profile on CA server Client/RA Mode configuration on Server. Could be {@code
+   *                  null}.
+   * @param csrModel  Certificate Signing Request model. Must not be {@code null}.
+   * @param server    CMPv2 Server. Must not be {@code null}.
+   * @param csr       Certificate Signing Request {.cer} file. Must not be {@code null}.
+   * @param notBefore An optional validity to set in the created certificate, Certificate not valid
+   *                  before this date.
+   * @param notAfter  An optional validity to set in the created certificate, Certificate not valid
+   *                  after this date.
+   * @return {@link X509Certificate} The newly created Certificate.
+   * @throws CmpClientException if client error occurs.
+   */
+  List<List<X509Certificate>> createCertificate(
+      String caName,
+      String profile,
+      CsrModel csrModel,
+      Cmpv2Server server,
+      X509Certificate csr,
+      Date notBefore,
+      Date notAfter)
+      throws CmpClientException;
 
-    /**
-     * Requests for a External Root CA Certificate to be created for the passed public keyPair wrapped
-     * in a CSRMeta with common details, accepts self-signed certificate. Basic Authentication using
-     * IAK/RV, Verification of the signature (proof-of-possession) on the request is performed and an
-     * Exception thrown if verification fails or issue encountered in fetching certificate from CA.
-     *
-     * @param caName  Information about the External Root Certificate Authority (CA) performing the
-     *                event CA Name. Could be {@code null}.
-     * @param profile Profile on CA server Client/RA Mode configuration on Server. Could be {@code
-     *                null}.
-     * @param csrMeta Certificate Signing Request Meta Data. Must not be {@code null}.
-     * @param csr     Certificate Signing Request {.cer} file. Must not be {@code null}.
-     * @return {@link X509Certificate} The newly created Certificate.
-     * @throws CmpClientException if client error occurs.
-     */
-    List<List<X509Certificate>> createCertificate(
-            String caName,
-            String profile,
-            CsrMeta csrMeta,
-            X509Certificate csr)
-            throws CmpClientException;
+  /**
+   * Requests for a External Root CA Certificate to be created for the passed public keyPair wrapped
+   * in a CSRMeta with common details, accepts self-signed certificate. Basic Authentication using
+   * IAK/RV, Verification of the signature (proof-of-possession) on the request is performed and an
+   * Exception thrown if verification fails or issue encountered in fetching certificate from CA.
+   *
+   * @param caName    Information about the External Root Certificate Authority (CA) performing the
+   *                  event CA Name. Could be {@code null}.
+   * @param profile   Profile on CA server Client/RA Mode configuration on Server. Could be {@code
+   *                  null}.
+   * @param csrModel  Certificate Signing Request Model. Must not be {@code null}.
+   * @param server    CMPv2 server. Must not be {@code null}.
+   * @param csr       Certificate Signing Request {.cer} file. Must not be {@code null}.
+   * @return {@link X509Certificate} The newly created Certificate.
+   * @throws CmpClientException if client error occurs.
+   */
+  List<List<X509Certificate>> createCertificate(
+      String caName,
+      String profile,
+      CsrModel csrModel,
+      Cmpv2Server server,
+      X509Certificate csr)
+      throws CmpClientException;
 }