[OOM-CERT-SERVICE] Code refactor

[oom/platform/cert-service.git] / certService / src / main / java / org / onap / oom / certservice / certification / model / OldCertificateModel.java

diff --git a/certService/src/main/java/org/onap/oom/certservice/certification/model/X509CertificateModel.java b/certService/src/main/java/org/onap/oom/certservice/certification/model/OldCertificateModel.java
similarity index 75%
rename from certService/src/main/java/org/onap/oom/certservice/certification/model/X509CertificateModel.java
rename to certService/src/main/java/org/onap/oom/certservice/certification/model/OldCertificateModel.java
index f45fb7d..bd2d33a 100644 (file)
--- a/certService/src/main/java/org/onap/oom/certservice/certification/model/X509CertificateModel.java
+++ b/certService/src/main/java/org/onap/oom/certservice/certification/model/OldCertificateModel.java
@@ -20,22 +20,28 @@
 
 package org.onap.oom.certservice.certification.model;
 
-import java.security.cert.X509Certificate;
+import java.security.PrivateKey;
 import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.Certificate;
 import org.bouncycastle.asn1.x509.GeneralName;
 
-public class X509CertificateModel {
+public class OldCertificateModel {
 
-    private final X509Certificate certificate;
     private final CertificateData certificateData;
 
-    public X509CertificateModel(X509Certificate certificate, X500Name subjectData,
-        GeneralName[] sans) {
-        this.certificate = certificate;
+    private final Certificate certificate;
+
+    private final PrivateKey oldPrivateKey;
+
+
+    public OldCertificateModel(Certificate certificate, X500Name subjectData,
+        GeneralName[] sans, PrivateKey oldPrivateKey) {
         this.certificateData = new CertificateData(subjectData, sans);
+        this.certificate = certificate;
+        this.oldPrivateKey = oldPrivateKey;
     }
 
-    public X509Certificate getCertificate() {
+    public Certificate getOldCertificate() {
         return certificate;
     }
 
@@ -50,4 +56,8 @@ public class X509CertificateModel {
     public CertificateData getCertificateData() {
         return certificateData;
     }
+
+    public PrivateKey getOldPrivateKey() {
+        return oldPrivateKey;
+    }
 }