Refactor GeneXusXmlSignature Module (#81)

sgrampone · web-flow · commit 825d468203ae · 2022-08-03T14:46:00.000-03:00
issue#97276
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/dsig/XmlDSigSigner.java b/GeneXusXmlSignature/src/main/java/com/genexus/dsig/XmlDSigSigner.java
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java
@@ -28,7 +28,7 @@ public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(String as
 		case "ECDSA":
 			return AsymmetricSigningAlgorithm.ECDSA;
 		default:
-			error.setError("AS001", "Unrecognized AsymmetricSigningAlgorithm");
+			error.setError("ASA01", "Unrecognized AsymmetricSigningAlgorithm");
 			return null;
 		}
 	}
@@ -47,7 +47,7 @@ public static String valueOf(AsymmetricSigningAlgorithm asymmetricSigningAlgorit
 		case ECDSA:
 			return "ECDSA";
 		default:
-			error.setError("AS002", "Unrecognized AsymmetricSigningAlgorithm");
+			error.setError("ASA02", "Unrecognized AsymmetricSigningAlgorithm");
 			return "";
 		}
 	}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java
@@ -32,7 +32,7 @@ public static CanonicalizerWrapper getCanonicalizerWrapper(String canonicalizerW
 		case "exc_C14N_WITH_COMMENTS":
 			return CanonicalizerWrapper.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
 		default:
-			error.setError("CM001", "Unrecognized CanonicalizationMethod: " + canonicalizerWrapper);
+			error.setError("CAW01", "Unrecognized CanonicalizationMethod");
 			return null;
 		}
 	}
@@ -55,7 +55,7 @@ public static String valueOf(CanonicalizerWrapper canonicalizerWrapper, Error er
 		case ALGO_ID_C14N_EXCL_WITH_COMMENTS:
 			return "exc_C14N_WITH_COMMENTS";
 		default:
-			error.setError("CM002", "Unrecognized CanonicalizationMethod");
+			error.setError("CAW02", "Unrecognized CanonicalizationMethod");
 			return "";
 		}
 	}
@@ -78,7 +78,7 @@ public static String valueOfInternal(CanonicalizerWrapper canonicalizerWrapper,
 		case ALGO_ID_C14N_EXCL_WITH_COMMENTS:
 			return "ALGO_ID_C14N_EXCL_WITH_COMMENTS";
 		default:
-			error.setError("CM003", "Unrecognized CanonicalizationMethod");
+			error.setError("CAW03", "Unrecognized CanonicalizationMethod");
 			return "";
 		}
 	}
@@ -94,7 +94,7 @@ public static String getCanonicalizationMethodAlorithm(CanonicalizerWrapper cano
 		case ALGO_ID_C14N_EXCL_OMIT_COMMENTS:
 			return Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
 		default:
-			error.setError("CM004", "Unrecognized CanonicalizationMethod");
+			error.setError("CAW04", "Unrecognized CanonicalizationMethod");
 			return null;
 
 		}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java
@@ -15,7 +15,7 @@ public static KeyInfoType getKeyInfoType(String keyInfoType, Error error) {
 		case "X509Certificate":
 			return X509Certificate;
 		default:
-			error.setError("KI001", "Unrecognized KeyInfoType");
+			error.setError("KIT01", "Unrecognized KeyInfoType");
 			return NONE;
 		}
 
@@ -30,7 +30,7 @@ public static String valueOf(KeyInfoType keyInfoType, Error error) {
 		case X509Certificate:
 			return "X509Certificate";
 		default:
-			error.setError("KI002", "Unrecognized KeyInfoType");
+			error.setError("KIT02", "Unrecognized KeyInfoType");
 			return "";
 		}
 	}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java
@@ -28,7 +28,7 @@ public static MessageDigestAlgorithmWrapper getMessageDigestAlgorithmWrapper(Str
 		case "SHA512":
 			return MessageDigestAlgorithmWrapper.SHA512;
 		default:
-			error.setError("MD001", "Algorithm not found: " + messageDigestAlgorithmWrapper);
+			error.setError("MDA01", "Not recognized digest algorithm");
 			return null;
 		}
 	}
@@ -49,7 +49,7 @@ public static String valueOf(MessageDigestAlgorithmWrapper messageDigestAlgorith
 		case SHA512:
 			return "SHA512";
 		default:
-			error.setError("MD002", "Not recognized digest algorithm");
+			error.setError("MDA02", "Not recognized digest algorithm");
 			return null;
 		}
 	}
@@ -63,7 +63,7 @@ public static String getDigestMethod(MessageDigestAlgorithmWrapper messageDigest
 		case SHA512:
 			return MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512;
 		default:
-			error.setError("MD003", "Not recognized digest algorithm");
+			error.setError("MDA03", "Not recognized digest algorithm");
 			return null;
 		}
 	}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/SignatureElementType.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/SignatureElementType.java
@@ -14,7 +14,7 @@ public static String valueOf(SignatureElementType signatureElementType, Error er
 		case document:
 			return "document";
 		default:
-			error.setError("SE001", "Unrecognized SignatureElementType");
+			error.setError("SET01", "Unrecognized SignatureElementType");
 			return "";
 
 		}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java
@@ -26,7 +26,7 @@ public static TransformsWrapper getTransformsWrapper(String transformsWrapper, E
 		case "DETACHED":
 			return TransformsWrapper.DETACHED;
 		default:
-			error.setError("TW001", "Unrecognized transformation: " + transformsWrapper);
+			error.setError("TRW01", "Unrecognized transformation");
 			return null;
 		}
 	}
@@ -47,7 +47,7 @@ public static String valueOf(TransformsWrapper transformsWrapper, Error error) {
 		case DETACHED:
 			return "DETACHED";
 		default:
-			error.setError("TW002", "Unrecognized transformation");
+			error.setError("TRW02", "Unrecognized transformation");
 			return null;
 		}
 	}
@@ -61,7 +61,7 @@ public static String getSignatureTypeTransform(TransformsWrapper transformsWrapp
 		case DETACHED:
 			return "http://www.w3.org/2000/09/xmldsig#detached-signature";
 		default:
-			error.setError("TW003", "Unrecognized transformation");
+			error.setError("TRW03", "Unrecognized transformation");
 			return null;
 
 		}
diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java
@@ -30,7 +30,7 @@ public static XMLSignatureWrapper getXMLSignatureWrapper(String xMLSignatureWrap
 		case "ECDSA_SHA256":
 			return ECDSA_SHA256;
 		default:
-			error.setError("XS001", "Unrecognized algorithm: " + xMLSignatureWrapper);
+			error.setError("XSW01", "Unrecognized algorithm");
 			return null;
 		}
 	}
@@ -55,7 +55,7 @@ public static String valueOf(XMLSignatureWrapper xMLSignatureWrapper, Error erro
 		case ECDSA_SHA256:
 			return "ECDSA_SHA256";
 		default:
-			error.setError("XS002", "Unrecognized algorithm");
+			error.setError("XSW02", "Unrecognized algorithm");
 			return null;
 		}
 	}
@@ -73,7 +73,7 @@ public static String getSignatureMethodAlgorithm(XMLSignatureWrapper xMLSignatur
 		case ECDSA_SHA256:
 			return XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA256;
 		default:
-			error.setError("XS003", "Unrecognized algorithm");
+			error.setError("XSW03", "Unrecognized algorithm");
 			return null;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(String as`
`28`	`28`	`case "ECDSA":`
`29`	`29`	`return AsymmetricSigningAlgorithm.ECDSA;`
`30`	`30`	`default:`
`31`		`- error.setError("AS001", "Unrecognized AsymmetricSigningAlgorithm");`
	`31`	`+ error.setError("ASA01", "Unrecognized AsymmetricSigningAlgorithm");`
`32`	`32`	`return null;`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -47,7 +47,7 @@ public static String valueOf(AsymmetricSigningAlgorithm asymmetricSigningAlgorit`
`47`	`47`	`case ECDSA:`
`48`	`48`	`return "ECDSA";`
`49`	`49`	`default:`
`50`		`- error.setError("AS002", "Unrecognized AsymmetricSigningAlgorithm");`
	`50`	`+ error.setError("ASA02", "Unrecognized AsymmetricSigningAlgorithm");`
`51`	`51`	`return "";`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static CanonicalizerWrapper getCanonicalizerWrapper(String canonicalizerW`
`32`	`32`	`case "exc_C14N_WITH_COMMENTS":`
`33`	`33`	`return CanonicalizerWrapper.ALGO_ID_C14N_EXCL_WITH_COMMENTS;`
`34`	`34`	`default:`
`35`		`- error.setError("CM001", "Unrecognized CanonicalizationMethod: " + canonicalizerWrapper);`
	`35`	`+ error.setError("CAW01", "Unrecognized CanonicalizationMethod");`
`36`	`36`	`return null;`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -55,7 +55,7 @@ public static String valueOf(CanonicalizerWrapper canonicalizerWrapper, Error er`
`55`	`55`	`case ALGO_ID_C14N_EXCL_WITH_COMMENTS:`
`56`	`56`	`return "exc_C14N_WITH_COMMENTS";`
`57`	`57`	`default:`
`58`		`- error.setError("CM002", "Unrecognized CanonicalizationMethod");`
	`58`	`+ error.setError("CAW02", "Unrecognized CanonicalizationMethod");`
`59`	`59`	`return "";`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -78,7 +78,7 @@ public static String valueOfInternal(CanonicalizerWrapper canonicalizerWrapper,`
`78`	`78`	`case ALGO_ID_C14N_EXCL_WITH_COMMENTS:`
`79`	`79`	`return "ALGO_ID_C14N_EXCL_WITH_COMMENTS";`
`80`	`80`	`default:`
`81`		`- error.setError("CM003", "Unrecognized CanonicalizationMethod");`
	`81`	`+ error.setError("CAW03", "Unrecognized CanonicalizationMethod");`
`82`	`82`	`return "";`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -94,7 +94,7 @@ public static String getCanonicalizationMethodAlorithm(CanonicalizerWrapper cano`
`94`	`94`	`case ALGO_ID_C14N_EXCL_OMIT_COMMENTS:`
`95`	`95`	`return Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;`
`96`	`96`	`default:`
`97`		`- error.setError("CM004", "Unrecognized CanonicalizationMethod");`
	`97`	`+ error.setError("CAW04", "Unrecognized CanonicalizationMethod");`
`98`	`98`	`return null;`
`99`	`99`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static KeyInfoType getKeyInfoType(String keyInfoType, Error error) {`
`15`	`15`	`case "X509Certificate":`
`16`	`16`	`return X509Certificate;`
`17`	`17`	`default:`
`18`		`- error.setError("KI001", "Unrecognized KeyInfoType");`
	`18`	`+ error.setError("KIT01", "Unrecognized KeyInfoType");`
`19`	`19`	`return NONE;`
`20`	`20`	`}`
`21`	`21`
`@@ -30,7 +30,7 @@ public static String valueOf(KeyInfoType keyInfoType, Error error) {`
`30`	`30`	`case X509Certificate:`
`31`	`31`	`return "X509Certificate";`
`32`	`32`	`default:`
`33`		`- error.setError("KI002", "Unrecognized KeyInfoType");`
	`33`	`+ error.setError("KIT02", "Unrecognized KeyInfoType");`
`34`	`34`	`return "";`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static MessageDigestAlgorithmWrapper getMessageDigestAlgorithmWrapper(Str`
`28`	`28`	`case "SHA512":`
`29`	`29`	`return MessageDigestAlgorithmWrapper.SHA512;`
`30`	`30`	`default:`
`31`		`- error.setError("MD001", "Algorithm not found: " + messageDigestAlgorithmWrapper);`
	`31`	`+ error.setError("MDA01", "Not recognized digest algorithm");`
`32`	`32`	`return null;`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -49,7 +49,7 @@ public static String valueOf(MessageDigestAlgorithmWrapper messageDigestAlgorith`
`49`	`49`	`case SHA512:`
`50`	`50`	`return "SHA512";`
`51`	`51`	`default:`
`52`		`- error.setError("MD002", "Not recognized digest algorithm");`
	`52`	`+ error.setError("MDA02", "Not recognized digest algorithm");`
`53`	`53`	`return null;`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -63,7 +63,7 @@ public static String getDigestMethod(MessageDigestAlgorithmWrapper messageDigest`
`63`	`63`	`case SHA512:`
`64`	`64`	`return MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512;`
`65`	`65`	`default:`
`66`		`- error.setError("MD003", "Not recognized digest algorithm");`
	`66`	`+ error.setError("MDA03", "Not recognized digest algorithm");`
`67`	`67`	`return null;`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static String valueOf(SignatureElementType signatureElementType, Error er`
`14`	`14`	`case document:`
`15`	`15`	`return "document";`
`16`	`16`	`default:`
`17`		`- error.setError("SE001", "Unrecognized SignatureElementType");`
	`17`	`+ error.setError("SET01", "Unrecognized SignatureElementType");`
`18`	`18`	`return "";`
`19`	`19`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static TransformsWrapper getTransformsWrapper(String transformsWrapper, E`
`26`	`26`	`case "DETACHED":`
`27`	`27`	`return TransformsWrapper.DETACHED;`
`28`	`28`	`default:`
`29`		`- error.setError("TW001", "Unrecognized transformation: " + transformsWrapper);`
	`29`	`+ error.setError("TRW01", "Unrecognized transformation");`
`30`	`30`	`return null;`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -47,7 +47,7 @@ public static String valueOf(TransformsWrapper transformsWrapper, Error error) {`
`47`	`47`	`case DETACHED:`
`48`	`48`	`return "DETACHED";`
`49`	`49`	`default:`
`50`		`- error.setError("TW002", "Unrecognized transformation");`
	`50`	`+ error.setError("TRW02", "Unrecognized transformation");`
`51`	`51`	`return null;`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -61,7 +61,7 @@ public static String getSignatureTypeTransform(TransformsWrapper transformsWrapp`
`61`	`61`	`case DETACHED:`
`62`	`62`	`return "http://www.w3.org/2000/09/xmldsig#detached-signature";`
`63`	`63`	`default:`
`64`		`- error.setError("TW003", "Unrecognized transformation");`
	`64`	`+ error.setError("TRW03", "Unrecognized transformation");`
`65`	`65`	`return null;`
`66`	`66`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static XMLSignatureWrapper getXMLSignatureWrapper(String xMLSignatureWrap`
`30`	`30`	`case "ECDSA_SHA256":`
`31`	`31`	`return ECDSA_SHA256;`
`32`	`32`	`default:`
`33`		`- error.setError("XS001", "Unrecognized algorithm: " + xMLSignatureWrapper);`
	`33`	`+ error.setError("XSW01", "Unrecognized algorithm");`
`34`	`34`	`return null;`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -55,7 +55,7 @@ public static String valueOf(XMLSignatureWrapper xMLSignatureWrapper, Error erro`
`55`	`55`	`case ECDSA_SHA256:`
`56`	`56`	`return "ECDSA_SHA256";`
`57`	`57`	`default:`
`58`		`- error.setError("XS002", "Unrecognized algorithm");`
	`58`	`+ error.setError("XSW02", "Unrecognized algorithm");`
`59`	`59`	`return null;`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -73,7 +73,7 @@ public static String getSignatureMethodAlgorithm(XMLSignatureWrapper xMLSignatur`
`73`	`73`	`case ECDSA_SHA256:`
`74`	`74`	`return XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA256;`
`75`	`75`	`default:`
`76`		`- error.setError("XS003", "Unrecognized algorithm");`
	`76`	`+ error.setError("XSW03", "Unrecognized algorithm");`
`77`	`77`	`return null;`
`78`	`78`	`}`
`79`	`79`	`}`