X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fcert%2FRDN.java;h=f57c837a1933e3f7b5411e5998ec3a71b3dde652;hb=7e966914050e66219689001ff4ab601a49eef0ac;hp=5b55f1cac70fd7fa0b76afec257b399cd92798d2;hpb=baea56e2de52d32c77bb19299e631165be53c9c8;p=aaf%2Fauthz.git

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 5b55f1ca..f57c837a 100644
--- 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
@@ -25,79 +25,79 @@ import java.util.List;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.onap.aaf.cadi.cm.CertException;
+import org.onap.aaf.cadi.configure.CertException;
 import org.onap.aaf.cadi.util.Split;
 
 public class RDN {
-	public String tag;
-	public String value;
-	public ASN1ObjectIdentifier aoi;
-	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 "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;
-			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
-	 * @param dnString
-	 * @return
-	 * @throws CertException
-	 */
-	public static List<RDN> parse(final char delim, final String dnString ) throws CertException {
-		List<RDN> lrnd = new ArrayList<RDN>();
-		StringBuilder sb = new StringBuilder();
-		boolean inQuotes = false;
-		for(int i=0;i<dnString.length();++i) {
-			char c = dnString.charAt(i);
-			if(inQuotes) {
-				if('"' == c) {
-					inQuotes=false;
-				} else {
-					sb.append(dnString.charAt(i));
-				}
-			} else {
-				if('"' == c) {
-					inQuotes=true;
-				} else if(delim==c) {
-					if(sb.length()>0) {
-						lrnd.add(new RDN(sb.toString()));
-						sb.setLength(0);
-					}
-				} else {
-					sb.append(dnString.charAt(i));
-				}
-			}
-		}
-		if(sb.indexOf("=")>0) {
-			lrnd.add(new RDN(sb.toString()));
-		}
-		return lrnd;
-	}
-	
-	@Override
-	public String toString() {
-		return tag + '=' + value;
-	}
+    public String tag;
+    public String value;
+    public ASN1ObjectIdentifier aoi;
+    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 "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;
+            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
+     * @param dnString
+     * @return
+     * @throws CertException
+     */
+    public static List<RDN> parse(final char delim, final String dnString ) throws CertException {
+        List<RDN> lrnd = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
+        boolean inQuotes = false;
+        for (int i=0;i<dnString.length();++i) {
+            char c = dnString.charAt(i);
+            if (inQuotes) {
+                if ('"' == c) {
+                    inQuotes=false;
+                } else {
+                    sb.append(dnString.charAt(i));
+                }
+            } else {
+                if ('"' == c) {
+                    inQuotes=true;
+                } else if (delim==c) {
+                    if (sb.length()>0) {
+                        lrnd.add(new RDN(sb.toString()));
+                        sb.setLength(0);
+                    }
+                } else {
+                    sb.append(dnString.charAt(i));
+                }
+            }
+        }
+        if (sb.indexOf("=")>0) {
+            lrnd.add(new RDN(sb.toString()));
+        }
+        return lrnd;
+    }
+    
+    @Override
+    public String toString() {
+        return tag + '=' + value;
+    }
 }
\ No newline at end of file