common EGIZ code-style refactoring

4 files changed, 172 insertions, 156 deletions

diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
index a3243635..155bfadd 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/ISignatureVerificationService.java
@@ -1,84 +1,90 @@
 package at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api;
 
 import java.util.List;
-
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.ICMSSignatureVerificationResponse;
 import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data.IXMLSignatureVerificationResponse;
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MOASigServiceException;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceException;
 
 public interface ISignatureVerificationService {
 
-	/**
-	 * Verify a CAdES or CMS signature
-	 * <br><br>
-	 * <i>This method only validates the first CMS or CAdES signature if more than one signature exists</i>
-	 *  
-	 * @param signature Enveloped CMS or CAdES signature
-	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
-	 * @return @link {@link ICMSSignatureVerificationResponse}, or null if no signature was found 
-	 * @throws MOASigServiceException on signatue-verification error
-	 */
-	ICMSSignatureVerificationResponse verifyCMSSignature(byte[] signature, String trustProfileID)
-			throws MOASigServiceException;
+  /**
+   * Verify a CAdES or CMS signature. <br>
+   * <br>
+   * <i>This method only validates the first CMS or CAdES signature if more than one signature
+   * exists</i>
+   *
+   * @param signature Enveloped CMS or CAdES signature
+   * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+   * @return @link {@link ICMSSignatureVerificationResponse}, or null if no signature was found
+   * @throws MoaSigServiceException on signatue-verification error
+   */
+  ICMSSignatureVerificationResponse verifyCmsSignature(byte[] signature, String trustProfileID)
+      throws MoaSigServiceException;
 
 
 
-	/**
-	 * Verify a XML or XAdES signature
-	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
-	 * 
-	 * @param signature Serialized XML or XAdES signature
-	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
-	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found 
-	 * @throws MOASigServiceException on signatue-verification error
-	 */
-	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID)
-			throws MOASigServiceException;
+  /**
+   * Verify a XML or XAdES signature. <br>
+   * <br>
+   * <i>This method only validates the first XML or XAdES signature if more than one signature
+   * exists</i>
+   *
+   * @param signature Serialized XML or XAdES signature
+   * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+   * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+   * @throws MoaSigServiceException on signatue-verification error
+   */
+  IXMLSignatureVerificationResponse verifyXmlSignature(byte[] signature, String trustProfileID)
+      throws MoaSigServiceException;
 
-	/**
-	 * Verify a XML or XAdES signature
-	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
-	 * 
-	 * @param signature Serialized XML or XAdES signature
-	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
-	 * @param verifyTransformsInfoProfileID {@link List} of XML Transformations that should be used for signature-verification
-	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found 
-	 * @throws MOASigServiceException on signatue-verification error
-	 */
-	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
-			List<String> verifyTransformsInfoProfileID) throws MOASigServiceException;
+  /**
+   * Verify a XML or XAdES signature. <br>
+   * <br>
+   * <i>This method only validates the first XML or XAdES signature if more than one signature
+   * exists</i>
+   *
+   * @param signature Serialized XML or XAdES signature
+   * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+   * @param verifyTransformsInfoProfileID {@link List} of XML Transformations that should be used
+   *        for signature-verification
+   * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+   * @throws MoaSigServiceException on signatue-verification error
+   */
+  IXMLSignatureVerificationResponse verifyXmlSignature(byte[] signature, String trustProfileID,
+      List<String> verifyTransformsInfoProfileID) throws MoaSigServiceException;
 
 
-	/**
-	 * Verify a XML or XAdES signature
-	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
-	 *
-	 * @param signature Serialized XML or XAdES signature
-	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
-	 * @param signatureLocationXpath Xpath that points to location of Signature element
-	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
-	 * @throws MOASigServiceException on signatue-verification error
-	 */
-	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
-														 String signatureLocationXpath) throws MOASigServiceException;
+  /**
+   * Verify a XML or XAdES signature. <br>
+   * <br>
+   * <i>This method only validates the first XML or XAdES signature if more than one signature
+   * exists</i>
+   *
+   * @param signature Serialized XML or XAdES signature
+   * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+   * @param signatureLocationXpath Xpath that points to location of Signature element
+   * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+   * @throws MoaSigServiceException on signatue-verification error
+   */
+  IXMLSignatureVerificationResponse verifyXmlSignature(byte[] signature, String trustProfileID,
+      String signatureLocationXpath) throws MoaSigServiceException;
 
-	/**
-	 * Verify a XML or XAdES signature
-	 * <br><br>
-	 * <i>This method only validates the first XML or XAdES signature if more than one signature exists</i>
-	 *
-	 * @param signature Serialized XML or XAdES signature
-	 * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
-	 * @param verifyTransformsInfoProfileID {@link List} of XML Transformations that should be used for signature-verification
-	 * @param signatureLocationXpath Xpath that points to location of Signature element
-	 * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
-	 * @throws MOASigServiceException on signatue-verification error
-	 */
-	IXMLSignatureVerificationResponse verifyXMLSignature(byte[] signature, String trustProfileID,
-														 List<String> verifyTransformsInfoProfileID,
-														 String signatureLocationXpath) throws MOASigServiceException;
+  /**
+   * Verify a XML or XAdES signature. <br>
+   * <br>
+   * <i>This method only validates the first XML or XAdES signature if more than one signature
+   * exists</i>
+   *
+   * @param signature Serialized XML or XAdES signature
+   * @param trustProfileID Id of the Trust-Profile from MOA-Sig configuration
+   * @param verifyTransformsInfoProfileID {@link List} of XML Transformations that should be used
+   *        for signature-verification
+   * @param signatureLocationXpath Xpath that points to location of Signature element
+   * @return @link {@link IXMLSignatureVerificationResponse}, or null if no signature was found
+   * @throws MoaSigServiceException on signatue-verification error
+   */
+  IXMLSignatureVerificationResponse verifyXmlSignature(byte[] signature, String trustProfileID,
+      List<String> verifyTransformsInfoProfileID, String signatureLocationXpath)
+      throws MoaSigServiceException;
 
-}
\ No newline at end of file
+}
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IGenericSignatureVerificationResponse.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IGenericSignatureVerificationResponse.java
index 00d98c86..13a9b08f 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IGenericSignatureVerificationResponse.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IGenericSignatureVerificationResponse.java
@@ -5,65 +5,71 @@ import java.util.Date;
 
 import org.springframework.lang.Nullable;
 
-import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MOASigServiceException;
+import at.gv.egiz.eid.authhandler.modules.sigverify.moasig.exceptions.MoaSigServiceException;
 
 
 public interface IGenericSignatureVerificationResponse {
 
-	/**
-	 * Returns the signing time
-	 * 
-	 * @return Signing time, or null if signature contains no time information
-	 */
-	@Nullable
-	Date getSigningDateTime();
-	
-	/**
-	   * Returns the signatureCheckCode.
-	   * @return int
-	   */
-	int getSignatureCheckCode();
-	
-	/**
-	   * Returns the certificateCheckCode.
-	   * @return int
-	   */
-	int getCertificateCheckCode();
+  /**
+   * Returns the signing time
+   * 
+   * @return Signing time, or null if signature contains no time information
+   */
+  @Nullable
+  Date getSigningDateTime();
 
-	/**
-	   * Returns the qualifiedCertificate.
-	   * @return boolean
-	   */
-	boolean isQualifiedCertificate();
+  /**
+   * Returns the signatureCheckCode.
+   * 
+   * @return int
+   */
+  int getSignatureCheckCode();
 
-	/**
-	   * Returns the X509 certificate.
-	   * @return X509Certificate, or null if no certificate information exists
-	   * @throws MOASigServiceException if X509 certificate can not be deserialized
-	   */
-	@Nullable
-	X509Certificate getX509Certificate() throws MOASigServiceException;
+  /**
+   * Returns the certificateCheckCode.
+   * 
+   * @return int
+   */
+  int getCertificateCheckCode();
 
-	
-	/**
-	 * Returns the X509 certificate in serialized form
-	 * 
-	 * @return Serialized X509 certificate, or null if no certificate information exists
-	 */
-	@Nullable
-	byte[] getX509CertificateEncoded();
-	
-	/**
-	   * Returns the publicAuthority.
-	   * @return boolean
-	   */
-	boolean isPublicAuthority();
-	
-	/**
-	   * Returns the publicAuthorityCode.
-	   * @return String OID, or null if no OID exists
-	   */
-	@Nullable
-	String getPublicAuthorityCode();
+  /**
+   * Returns the qualifiedCertificate.
+   * 
+   * @return boolean
+   */
+  boolean isQualifiedCertificate();
+
+  /**
+   * Returns the X509 certificate.
+   * 
+   * @return X509Certificate, or null if no certificate information exists
+   * @throws MoaSigServiceException if X509 certificate can not be deserialized
+   */
+  @Nullable
+  X509Certificate getX509Certificate() throws MoaSigServiceException;
+
+
+  /**
+   * Returns the X509 certificate in serialized form
+   * 
+   * @return Serialized X509 certificate, or null if no certificate information exists
+   */
+  @Nullable
+  byte[] getX509CertificateEncoded();
+
+  /**
+   * Returns the publicAuthority.
+   * 
+   * @return boolean
+   */
+  boolean isPublicAuthority();
+
+  /**
+   * Returns the publicAuthorityCode.
+   * 
+   * @return String OID, or null if no OID exists
+   */
+  @Nullable
+  String getPublicAuthorityCode();
 
 }
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/ISchemaRessourceProvider.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/ISchemaRessourceProvider.java
index 9548d96b..9bd5791f 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/ISchemaRessourceProvider.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/ISchemaRessourceProvider.java
@@ -5,16 +5,17 @@ import java.util.Map;
 
 /**
  * Inject additional XML schemes into MOA-Sig
- * 
+ *
  * @author tlenz
  *
  */
 public interface ISchemaRessourceProvider {
 
-	/**
-	 * Get a Map of additional XML schemes that should be injected into MOA-Sig 
-	 * 
-	 * @return A Set of {@link Entry} consist of Name of the Scheme and XML scheme as {@link InputStream}  
-	 */
-	public Map<String, InputStream> getSchemas();
+  /**
+   * Get a Map of additional XML schemes that should be injected into MOA-Sig
+   * 
+   * @return A Set of {@link Entry} consist of Name of the Scheme and XML scheme as
+   *         {@link InputStream}
+   */
+  public Map<String, InputStream> getSchemas();
 }
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IXMLSignatureVerificationResponse.java b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IXMLSignatureVerificationResponse.java
index 3e86fb63..6273bb9e 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IXMLSignatureVerificationResponse.java
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/java/at/gv/egiz/eid/authhandler/modules/sigverify/moasig/api/data/IXMLSignatureVerificationResponse.java
@@ -7,31 +7,34 @@ package at.gv.egiz.eid.authhandler.modules.sigverify.moasig.api.data;
 public interface IXMLSignatureVerificationResponse extends IGenericSignatureVerificationResponse {
 
 
-	/**
-	   * Returns the xmlDSIGManifestCheckCode.
-	   * @return int
-	   */
-	int getXmlDSIGManifestCheckCode();
-
-	/**
-	   * Returns the xmlDsigSubjectName.
-	   * @return String
-	   */
-	String getXmlDsigSubjectName();
-
-	
-	/**
-	   * Returns the xmlDSIGManigest.
-	   * @return boolean
-	   */
-	boolean isXmlDSIGManigest();
-
-
-	/**
-	   * Returns the the resulting code of the signature manifest check.
-	   *
-	   * @return The code of the sigature manifest check.
-	   */
-	int getSignatureManifestCheckCode();
-
-}
\ No newline at end of file
+  /**
+   * Returns the xmlDSIGManifestCheckCode.
+   * 
+   * @return int
+   */
+  int getXmlDSIGManifestCheckCode();
+
+  /**
+   * Returns the xmlDsigSubjectName.
+   * 
+   * @return String
+   */
+  String getXmlDsigSubjectName();
+
+
+  /**
+   * Returns the xmlDSIGManigest.
+   * 
+   * @return boolean
+   */
+  boolean isXmlDSIGManigest();
+
+
+  /**
+   * Returns the the resulting code of the signature manifest check.
+   *
+   * @return The code of the sigature manifest check.
+   */
+  int getSignatureManifestCheckCode();
+
+}