Refactoring

dschadow · Dec 14, 2016 · bc21e80 · bc21e80
1 parent 6ce3e12
commit bc21e80
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/...g-security/src/main/java/de/dominikschadow/javasecurity/controller/ContactController.java b/...g-security/src/main/java/de/dominikschadow/javasecurity/controller/ContactController.java
@@ -38,7 +38,7 @@
 @RequestMapping(value = "/contacts")
 public class ContactController {
     private static final Logger log = LoggerFactory.getLogger(ContactController.class);
-    private ContactService contactService;
+    private final ContactService contactService;
 
     public ContactController(ContactService contactService) {
         this.contactService = contactService;

diff --git a/...spring-security/src/main/java/de/dominikschadow/javasecurity/services/ContactService.java b/...spring-security/src/main/java/de/dominikschadow/javasecurity/services/ContactService.java
@@ -35,7 +35,7 @@
  */
 @Service
 public class ContactService {
-    private JdbcTemplate jdbcTemplate;
+    private final JdbcTemplate jdbcTemplate;
 
     public ContactService(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;

diff --git a/crypto-java/src/main/java/de/dominikschadow/javasecurity/asymmetric/DSA.java b/crypto-java/src/main/java/de/dominikschadow/javasecurity/asymmetric/DSA.java
@@ -57,7 +57,7 @@ private static void sign() {
         final char[] keyPassword = "asymmetric-sample-dsa".toCharArray();
 
         try {
-            KeyStore ks = loadKeystore(KEYSTORE_PATH, keystorePassword);
+            KeyStore ks = loadKeystore(keystorePassword);
             PrivateKey privateKey = loadPrivateKey(ks, keyAlias, keyPassword);
             PublicKey publicKey = loadPublicKey(ks, keyAlias);
 
@@ -71,9 +71,9 @@ private static void sign() {
         }
     }
 
-    private static KeyStore loadKeystore(String keystorePath, char[] keystorePassword) throws KeyStoreException,
+    private static KeyStore loadKeystore(char[] keystorePassword) throws KeyStoreException,
             CertificateException, NoSuchAlgorithmException, IOException {
-        try (InputStream keystoreStream = DSA.class.getResourceAsStream(keystorePath)) {
+        try (InputStream keystoreStream = DSA.class.getResourceAsStream(KEYSTORE_PATH)) {
             KeyStore ks = KeyStore.getInstance("JCEKS");
             ks.load(keystoreStream, keystorePassword);
             return ks;

diff --git a/crypto-java/src/main/java/de/dominikschadow/javasecurity/asymmetric/RSA.java b/crypto-java/src/main/java/de/dominikschadow/javasecurity/asymmetric/RSA.java
@@ -61,7 +61,7 @@ private static void encrypt() {
         final char[] keyPassword = "asymmetric-sample-rsa".toCharArray();
 
         try {
-            KeyStore ks = loadKeystore(KEYSTORE_PATH, keystorePassword);
+            KeyStore ks = loadKeystore(keystorePassword);
             PrivateKey privateKey = loadPrivateKey(ks, keyAlias, keyPassword);
             PublicKey publicKey = loadPublicKey(ks, keyAlias);
 
@@ -76,9 +76,9 @@ private static void encrypt() {
         }
     }
 
-    private static KeyStore loadKeystore(String keystorePath, char[] keystorePassword) throws KeyStoreException,
+    private static KeyStore loadKeystore(char[] keystorePassword) throws KeyStoreException,
             CertificateException, NoSuchAlgorithmException, IOException {
-        try (InputStream keystoreStream = RSA.class.getResourceAsStream(keystorePath)) {
+        try (InputStream keystoreStream = RSA.class.getResourceAsStream(KEYSTORE_PATH)) {
             KeyStore ks = KeyStore.getInstance("JCEKS");
             ks.load(keystoreStream, keystorePassword);
             return ks;

diff --git a/crypto-java/src/main/java/de/dominikschadow/javasecurity/symmetric/AES.java b/crypto-java/src/main/java/de/dominikschadow/javasecurity/symmetric/AES.java
@@ -64,7 +64,7 @@ private void encrypt() {
 
         try {
             cipher = Cipher.getInstance(ALGORITHM);
-            KeyStore ks = loadKeystore(KEYSTORE_PATH, keystorePassword);
+            KeyStore ks = loadKeystore(keystorePassword);
             Key key = loadKey(ks, keyAlias, keyPassword);
             SecretKeySpec secretKeySpec = new SecretKeySpec(key.getEncoded(), "AES");
             byte[] ciphertext = encrypt(secretKeySpec, initialText);
@@ -79,9 +79,9 @@ private void encrypt() {
         }
     }
 
-    private KeyStore loadKeystore(String keystorePath, char[] keystorePassword) throws KeyStoreException,
+    private KeyStore loadKeystore(char[] keystorePassword) throws KeyStoreException,
             CertificateException, NoSuchAlgorithmException, IOException {
-        try (InputStream keystoreStream = getClass().getResourceAsStream(keystorePath)) {
+        try (InputStream keystoreStream = getClass().getResourceAsStream(KEYSTORE_PATH)) {
             KeyStore ks = KeyStore.getInstance("JCEKS");
             ks.load(keystoreStream, keystorePassword);
 
@@ -98,15 +98,15 @@ private static Key loadKey(KeyStore ks, String keyAlias, char[] keyPassword) thr
         return ks.getKey(keyAlias, keyPassword);
     }
 
-    private byte[] encrypt(SecretKeySpec secretKeySpec, String initialText) throws NoSuchPaddingException,
-            NoSuchAlgorithmException, UnsupportedEncodingException, BadPaddingException,
-            IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidKeyException {
+    private byte[] encrypt(SecretKeySpec secretKeySpec, String initialText) throws
+            UnsupportedEncodingException, BadPaddingException,
+            IllegalBlockSizeException, InvalidKeyException {
         cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec);
         return cipher.doFinal(initialText.getBytes("UTF-8"));
     }
 
-    private byte[] decrypt(SecretKeySpec secretKeySpec, byte[] ciphertext) throws NoSuchPaddingException,
-            NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException,
+    private byte[] decrypt(SecretKeySpec secretKeySpec, byte[] ciphertext) throws
+            BadPaddingException, IllegalBlockSizeException,
             InvalidAlgorithmParameterException, InvalidKeyException {
         cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, new IvParameterSpec(cipher.getIV()));
         return cipher.doFinal(ciphertext);

diff --git a/crypto-shiro/src/main/java/de/dominikschadow/javasecurity/symmetric/AESEncryption.java b/crypto-shiro/src/main/java/de/dominikschadow/javasecurity/symmetric/AESEncryption.java
@@ -51,7 +51,7 @@ public static void main(String[] args) {
         final char[] keyPassword = "symmetric-sample".toCharArray();
 
         try {
-            KeyStore ks = loadKeystore(KEYSTORE_PATH, keystorePassword);
+            KeyStore ks = loadKeystore(keystorePassword);
             Key key = loadKey(ks, keyAlias, keyPassword);
             byte[] ciphertext = encrypt(key, CodecSupport.toBytes(initialText));
             byte[] plaintext = decrypt(key, ciphertext);
@@ -62,8 +62,8 @@ public static void main(String[] args) {
         }
     }
 
-    private static KeyStore loadKeystore(String keystorePath, char[] keystorePassword) throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
-        InputStream keystoreStream = AESEncryption.class.getResourceAsStream(keystorePath);
+    private static KeyStore loadKeystore(char[] keystorePassword) throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
+        InputStream keystoreStream = AESEncryption.class.getResourceAsStream(KEYSTORE_PATH);
 
         KeyStore ks = KeyStore.getInstance("JCEKS");
         ks.load(keystoreStream, keystorePassword);