Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / auth / auth-certman / src / main / java / org / onap / aaf / auth / cm / data / CertReq.java

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java
index aa0b9c2..7de1994 100644 (file)
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/data/CertReq.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,22 +28,23 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import org.onap.aaf.auth.cm.ca.CA;
 import org.onap.aaf.auth.cm.cert.BCFactory;
 import org.onap.aaf.auth.cm.cert.CSRMeta;
-import org.onap.aaf.cadi.cm.CertException;
+import org.onap.aaf.cadi.configure.CertException;
 
 public class CertReq {
-       // These cannot be null
-       public CA certAuthority;
-       public String mechid;
-       public List<String> fqdns;
-       // Notify
-       public List<String> emails;
-       
-       
-       // These may be null
-       public String sponsor;
-       public XMLGregorianCalendar start, end;
-       
-       public CSRMeta getCSRMeta() throws CertException {
-               return BCFactory.createCSRMeta(certAuthority, mechid, sponsor,fqdns);
-       }
+    // These cannot be null
+    public CA certAuthority;
+    public String mechid;
+    public List<String> fqdns;
+    // Notify
+    public List<String> emails;
+
+
+    // These may be null
+    public String sponsor;
+    public XMLGregorianCalendar start;
+    public XMLGregorianCalendar end;
+
+    public CSRMeta getCSRMeta() throws CertException {
+        return BCFactory.createCSRMeta(certAuthority, mechid, sponsor,fqdns);
+    }
 }