preparing the old code for the merge

1 files changed, 45 insertions, 51 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
index 724a522d1..175084048 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
@@ -11,59 +11,53 @@ import org.slf4j.LoggerFactory;
  * @author vanegdi
  * @version $Revision: 1.00 $, $Date: 2013-05-24 20:53:51 $
  */
-public final class X509PrincipalUtil{
+public final class X509PrincipalUtil {
 
-    private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY= {
-            X509Principal.CN,
-            X509Principal.OU,
-            X509Principal.O,
-            X509Principal.L,
-            X509Principal.ST,
-            X509Principal.C,
-            X509Principal.E
-    };
-    
-    private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
+	private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY = { X509Principal.CN, X509Principal.OU, X509Principal.O, X509Principal.L, X509Principal.ST, X509Principal.C,
+			X509Principal.E };
 
-    /**
-     * Compares 2 X509Principals to detect if they equals
-     * @param principal1
-     * @param principal2
-     * @return true if arguments are not null and equals
-     */
-    public static boolean equals(X509Principal principal1, X509Principal principal2) {
-        boolean continueProcess = true;
-        if (principal1 == null || principal2 == null){
-            return false;
-        }
-        
-        int cpt = 0;
-        while(continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length){
-            continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
-            cpt++;
-        }
-        return continueProcess;
-    }
-    
-    public static boolean equals2(X509Principal principal1, X509Principal principal2) {
-        
-        if (principal1 == null || principal2 == null){
-            return false;
-        }
-        
-        if (principal1.getName().equals(principal2.getName()))
-        	return true;
-        else
-        	return false;
-        
-    }
+	private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
 
-    private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier){
-        return principal1.getValues(identifier).equals(principal2.getValues(identifier));
-    }
+	/**
+	 * Compares 2 X509Principals to detect if they equals
+	 * 
+	 * @param principal1
+	 * @param principal2
+	 * @return true if arguments are not null and equals
+	 */
+	public static boolean equals(X509Principal principal1, X509Principal principal2) {
+		boolean continueProcess = true;
+		if (principal1 == null || principal2 == null) {
+			return false;
+		}
 
-    private X509PrincipalUtil(){
-        // default contructor
-        LOG.error("Fake X509PrincipalUtil : never be called");
-    }
+		int cpt = 0;
+		while (continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length) {
+			continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
+			cpt++;
+		}
+		return continueProcess;
+	}
+
+	public static boolean equals2(X509Principal principal1, X509Principal principal2) {
+
+		if (principal1 == null || principal2 == null) {
+			return false;
+		}
+
+		if (principal1.getName().equals(principal2.getName()))
+			return true;
+		else
+			return false;
+
+	}
+
+	private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier) {
+		return principal1.getValues(identifier).equals(principal2.getValues(identifier));
+	}
+
+	private X509PrincipalUtil() {
+		// default contructor
+		LOG.error("Fake X509PrincipalUtil : never be called");
+	}
 }