some code code-style modifications

active code-quality checks!

1 files changed, 29 insertions, 52 deletions

diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
index d3726546..d1793b0e 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
@@ -24,7 +24,6 @@ public class SL20Constants {
 
   public static final String HTTP_HEADER_SL20_RESP = "X-SL20Operation";
 
-
   // *******************************************************************************************
   // JSON signing and encryption headers
   public static final String JSON_ALGORITHM = "alg";
@@ -39,22 +38,19 @@ public class SL20Constants {
       AlgorithmIdentifiers.ECDSA_USING_P256_CURVE_AND_SHA256;
   public static final String JSON_ALGORITHM_SIGNING_ES512 =
       AlgorithmIdentifiers.ECDSA_USING_P521_CURVE_AND_SHA512;
-  public static final String JSON_ALGORITHM_SIGNING_PS256 =
-      AlgorithmIdentifiers.RSA_PSS_USING_SHA256;
-  public static final String JSON_ALGORITHM_SIGNING_PS512 =
-      AlgorithmIdentifiers.RSA_PSS_USING_SHA512;
+  public static final String JSON_ALGORITHM_SIGNING_PS256 = AlgorithmIdentifiers.RSA_PSS_USING_SHA256;
+  public static final String JSON_ALGORITHM_SIGNING_PS512 = AlgorithmIdentifiers.RSA_PSS_USING_SHA512;
 
-  public static final List<String> SL20_ALGORITHM_WHITELIST_SIGNING = Collections.unmodifiableList(Arrays.asList(
-      JSON_ALGORITHM_SIGNING_RS256, JSON_ALGORITHM_SIGNING_RS512, JSON_ALGORITHM_SIGNING_ES256,
-      JSON_ALGORITHM_SIGNING_ES512, JSON_ALGORITHM_SIGNING_PS256, JSON_ALGORITHM_SIGNING_PS512));
+  public static final List<String> SL20_ALGORITHM_WHITELIST_SIGNING = Collections.unmodifiableList(
+      Arrays.asList(JSON_ALGORITHM_SIGNING_RS256, JSON_ALGORITHM_SIGNING_RS512, JSON_ALGORITHM_SIGNING_ES256,
+          JSON_ALGORITHM_SIGNING_ES512, JSON_ALGORITHM_SIGNING_PS256, JSON_ALGORITHM_SIGNING_PS512));
 
-  public static final String JSON_ALGORITHM_ENC_KEY_RSAOAEP =
-      KeyManagementAlgorithmIdentifiers.RSA_OAEP;
+  public static final String JSON_ALGORITHM_ENC_KEY_RSAOAEP = KeyManagementAlgorithmIdentifiers.RSA_OAEP;
   public static final String JSON_ALGORITHM_ENC_KEY_RSAOAEP256 =
       KeyManagementAlgorithmIdentifiers.RSA_OAEP_256;
 
-  public static final List<String> SL20_ALGORITHM_WHITELIST_KEYENCRYPTION =
-		  Collections.unmodifiableList(Arrays.asList(JSON_ALGORITHM_ENC_KEY_RSAOAEP, JSON_ALGORITHM_ENC_KEY_RSAOAEP256));
+  public static final List<String> SL20_ALGORITHM_WHITELIST_KEYENCRYPTION = Collections
+      .unmodifiableList(Arrays.asList(JSON_ALGORITHM_ENC_KEY_RSAOAEP, JSON_ALGORITHM_ENC_KEY_RSAOAEP256));
 
   public static final String JSON_ALGORITHM_ENC_PAYLOAD_A128CBCHS256 =
       ContentEncryptionAlgorithmIdentifiers.AES_128_CBC_HMAC_SHA_256;
@@ -65,10 +61,10 @@ public class SL20Constants {
   public static final String JSON_ALGORITHM_ENC_PAYLOAD_A256GCM =
       ContentEncryptionAlgorithmIdentifiers.AES_256_GCM;
 
-  public static final List<String> SL20_ALGORITHM_WHITELIST_ENCRYPTION = Collections.unmodifiableList(Arrays.asList(
-      JSON_ALGORITHM_ENC_PAYLOAD_A128CBCHS256, JSON_ALGORITHM_ENC_PAYLOAD_A256CBCHS512,
-      JSON_ALGORITHM_ENC_PAYLOAD_A128GCM, JSON_ALGORITHM_ENC_PAYLOAD_A256GCM));
-
+  public static final List<String> SL20_ALGORITHM_WHITELIST_ENCRYPTION = Collections
+      .unmodifiableList(Arrays.asList(JSON_ALGORITHM_ENC_PAYLOAD_A128CBCHS256,
+          JSON_ALGORITHM_ENC_PAYLOAD_A256CBCHS512,
+          JSON_ALGORITHM_ENC_PAYLOAD_A128GCM, JSON_ALGORITHM_ENC_PAYLOAD_A256GCM));
 
   // *********************************************************************************************
   // Object identifier for generic transport container
@@ -96,12 +92,12 @@ public class SL20Constants {
   @Deprecated
   public static final String SL20_COMMAND_IDENTIFIER_QUALIFIEDEID = "qualifiedeID";
   public static final String SL20_COMMAND_IDENTIFIER_QUALIFIEDEIDCONSENT = "qualifiedEIDConsent";
-  // public static final String SL20_COMMAND_IDENTIFIER_QUALIFIEDSIG = "qualifiedSig";
+  // public static final String SL20_COMMAND_IDENTIFIER_QUALIFIEDSIG =
+  // "qualifiedSig";
 
   public static final String SL20_COMMAND_IDENTIFIER_GETCERTIFICATE = "getCertificate";
   public static final String SL20_COMMAND_IDENTIFIER_CREATE_SIG_CADES = "createCAdES";
 
-
   public static final String SL20_COMMAND_IDENTIFIER_BINDING_CREATE_KEY = "createBindingKey";
   public static final String SL20_COMMAND_IDENTIFIER_BINDING_STORE_CERT = "storeBindingCert";
 
@@ -124,13 +120,11 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_GENERAL_REDIRECT_IPCREDIRECT = "IPCRedirect";
 
   // Call command
-  public static final String SL20_COMMAND_PARAM_GENERAL_CALL_URL =
-      SL20_COMMAND_PARAM_GENERAL_REDIRECT_URL;
+  public static final String SL20_COMMAND_PARAM_GENERAL_CALL_URL = SL20_COMMAND_PARAM_GENERAL_REDIRECT_URL;
   public static final String SL20_COMMAND_PARAM_GENERAL_CALL_METHOD = "method";
   public static final String SL20_COMMAND_PARAM_GENERAL_CALL_METHOD_GET = "get";
   public static final String SL20_COMMAND_PARAM_GENERAL_CALL_METHOD_POST = "post";
-  public static final String SL20_COMMAND_PARAM_GENERAL_CALL_INCLUDETRANSACTIONID =
-      "includeTransactionID";
+  public static final String SL20_COMMAND_PARAM_GENERAL_CALL_INCLUDETRANSACTIONID = "includeTransactionID";
   public static final String SL20_COMMAND_PARAM_GENERAL_CALL_REQPARAMETER = "reqParams";
 
   // error command
@@ -144,8 +138,7 @@ public class SL20Constants {
   @Deprecated
   public static final String SL20_COMMAND_PARAM_EID_ATTRIBUTES = "attributes";
   @Deprecated
-  public static final String SL20_COMMAND_PARAM_EID_ATTRIBUTES_MANDATEREFVALUE =
-      "MANDATE-REFERENCE-VALUE";
+  public static final String SL20_COMMAND_PARAM_EID_ATTRIBUTES_MANDATEREFVALUE = "MANDATE-REFERENCE-VALUE";
   @Deprecated
   public static final String SL20_COMMAND_PARAM_EID_ATTRIBUTES_SPUNIQUEID = "SP-UNIQUEID";
   @Deprecated
@@ -176,11 +169,9 @@ public class SL20Constants {
   // public static final String SL20_COMMAND_PARAM_QUALSIG_X5CENC =
   // SL20_COMMAND_PARAM_GENERAL_RESPONSEENCRYPTIONCERTIFICATE;
 
-
   // getCertificate
   public static final String SL20_COMMAND_PARAM_GETCERTIFICATE_KEYID = "keyId";
-  public static final String SL20_COMMAND_PARAM_GETCERTIFICATE_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_GETCERTIFICATE_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
   public static final String SL20_COMMAND_PARAM_GETCERTIFICATE_X5CENC =
       SL20_COMMAND_PARAM_GENERAL_RESPONSEENCRYPTIONCERTIFICATE;
   public static final String SL20_COMMAND_PARAM_GETCERTIFICATE_JWKCENC =
@@ -191,13 +182,10 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_KEYID = "keyId";
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_CONTENT = "content";
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_MIMETYPE = "mimeType";
-  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_PADES_COMBATIBILTY =
-      "padesComatibility";
-  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_EXCLUDEBYTERANGE =
-      "excludedByteRange";
+  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_PADES_COMBATIBILTY = "padesComatibility";
+  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_EXCLUDEBYTERANGE = "excludedByteRange";
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_CADESLEVEL = "cadesLevel";
-  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_X5CENC =
       SL20_COMMAND_PARAM_GENERAL_RESPONSEENCRYPTIONCERTIFICATE;
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_JWKCENC =
@@ -211,19 +199,15 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_CADESLEVEL_XL = "cAdES-X-L";
   public static final String SL20_COMMAND_PARAM_CREATE_SIG_CADES_CADESLEVEL_A = "cAdES-A";
 
-
-
   // create binding key command
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_KONTOID = "kontoID";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_SN = "SN";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_KEYLENGTH = "keyLength";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_KEYALG = "keyAlg";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES = "policies";
-  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_X5CVDATRUST = "x5cVdaTrust";
-  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_REQUESTUSERPASSWORD =
-      "reqUserPassword";
+  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_REQUESTUSERPASSWORD = "reqUserPassword";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_X5CENC =
       SL20_COMMAND_PARAM_GENERAL_RESPONSEENCRYPTIONCERTIFICATE;
 
@@ -231,23 +215,18 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_KEYALG_SECPR256R1 = "secp256r1";
 
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_LIFETIME = "lifeTime";
-  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_USESECUREELEMENT =
-      "useSecureElement";
+  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_USESECUREELEMENT = "useSecureElement";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_KEYTIMEOUT = "keyTimeout";
-  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_NEEDUSERAUTH =
-      "needUserAuth";
+  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_POLICIES_NEEDUSERAUTH = "needUserAuth";
 
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_RESULT_APPID = "appID";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_RESULT_CSR = "csr";
-  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_RESULT_KEYATTESTATIONZERTIFICATE =
-      "attCert";
+  public static final String SL20_COMMAND_PARAM_BINDING_CREATE_RESULT_KEYATTESTATIONZERTIFICATE = "attCert";
   public static final String SL20_COMMAND_PARAM_BINDING_CREATE_RESULT_USERPASSWORD = "encodedPass";
 
-
   // store binding certificate command
   public static final String SL20_COMMAND_PARAM_BINDING_STORE_CERTIFICATE = "x5c";
-  public static final String SL20_COMMAND_PARAM_BINDING_STORE_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_BINDING_STORE_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
   public static final String SL20_COMMAND_PARAM_BINDING_STORE_RESULT_SUCESS = "success";
   public static final String SL20_COMMAND_PARAM_BINDING_STORE_RESULT_SUCESS_VALUE = "OK";
 
@@ -268,14 +247,12 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_NONCE = "nonce";
   public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_DISPLAYDATA = "displayData";
   public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_DISPLAYURL = "displayUrl";
-  public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
   public static final String SL20_COMMAND_PARAM_AUTH_JWSTOKEN_RESULT_NONCE =
       SL20_COMMAND_PARAM_AUTH_JWSTOKEN_NONCE;
 
   // QR-Code authentication
   public static final String SL20_COMMAND_PARAM_AUTH_QRCODE_QRCODE = "qrCode";
-  public static final String SL20_COMMAND_PARAM_AUTH_QRCODE_DATAURL =
-      SL20_COMMAND_PARAM_GENERAL_DATAURL;
+  public static final String SL20_COMMAND_PARAM_AUTH_QRCODE_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
 
 }