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

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

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java
index f57c837..c43e614 100644 (file)
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.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.
@@ -35,29 +35,43 @@ public class RDN {
     public RDN(final String tagValue) throws CertException {
         String[] tv = Split.splitTrim('=',tagValue);
         switch(tv[0]) {
-            case "cn":case "CN":            aoi = BCStyle.CN; break;
-            case "c":case "C":            aoi = BCStyle.C;break;
-            case "st":case "ST":            aoi = BCStyle.ST;break;
-            case "l":case "L":              aoi = BCStyle.L;break;
-            case "o":case "O":            aoi = BCStyle.O;break;
-            case "ou":case "OU":            aoi = BCStyle.OU;break;
-            case "dc":case "DC":            aoi = BCStyle.DC;break;
-            case "gn":case "GN":            aoi = BCStyle.GIVENNAME; break;
-            case "sn":case "SN":            aoi = BCStyle.SN; break;  // surname
+            case "cn":case "CN":            aoi = BCStyle.CN;
+            break;
+            case "c":case "C":            aoi = BCStyle.C;
+            break;
+            case "st":case "ST":            aoi = BCStyle.ST;
+            break;
+            case "l":case "L":              aoi = BCStyle.L;
+            break;
+            case "o":case "O":            aoi = BCStyle.O;
+            break;
+            case "ou":case "OU":            aoi = BCStyle.OU;
+            break;
+            case "dc":case "DC":            aoi = BCStyle.DC;
+            break;
+            case "gn":case "GN":            aoi = BCStyle.GIVENNAME;
+            break;
+            case "sn":case "SN":            aoi = BCStyle.SN;
+            break;  // surname
             case "email":case "EMAIL":
             case "emailaddress":
-            case "EMAILADDRESS":            aoi = BCStyle.EmailAddress;break; // should be SAN extension
-            case "initials":                aoi = BCStyle.INITIALS; break; 
-            case "pseudonym":            aoi = BCStyle.PSEUDONYM; break;
-            case "generationQualifier":    aoi = BCStyle.GENERATION; break;
-            case "serialNumber":            aoi = BCStyle.SERIALNUMBER; break;
+            case "EMAILADDRESS":            aoi = BCStyle.EmailAddress;
+            break; // should be SAN extension
+            case "initials":                aoi = BCStyle.INITIALS;
+            break;
+            case "pseudonym":            aoi = BCStyle.PSEUDONYM;
+            break;
+            case "generationQualifier":    aoi = BCStyle.GENERATION;
+            break;
+            case "serialNumber":            aoi = BCStyle.SERIALNUMBER;
+            break;
             default:
                 throw new CertException("Unknown ASN1ObjectIdentifier for " + tv[0] + " in " + tagValue);
         }
         tag = tv[0];
         value = tv[1];
     }
-    
+
     /**
      * Parse various forms of DNs into appropriate RDNs, which have the ASN1ObjectIdentifier
      * @param delim
@@ -95,7 +109,7 @@ public class RDN {
         }
         return lrnd;
     }
-    
+
     @Override
     public String toString() {
         return tag + '=' + value;