Merge remote-tracking branch 'origin/develop' into release/8.6.0

Author: jbern0rd

CHANGELOG.md

@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 - Configure Gradle JVM Test Suite Plugin. (#259)
 - Replace `SECURE_SESSION_NO_TEE_PROVIDER` with `SECURE_SESSION_NO_TEE_FRAMEWORK`
   in `TeeSessionGenerationError`. (#265)
+- Add `final` keyword in `EncryptionService`. (#268)
 
 ### Dependency Upgrades
 

src/main/java/com/iexec/sms/encryption/EncryptionService.java

@@ -71,10 +71,10 @@ private byte[] getOrCreateAesKey(String aesKeyPath) {
             throw new ExceptionInInitializerError("Failed to get aesKeyPath");
         }
 
-        boolean shouldGenerateKey = !new File(aesKeyPath).exists();
+        final boolean shouldGenerateKey = !new File(aesKeyPath).exists();
 
         if (shouldGenerateKey) {
-            byte[] newAesKey = CipherHelper.generateAesKey();
+            final byte[] newAesKey = CipherHelper.generateAesKey();
 
             if (newAesKey == null) {
                 throw new ExceptionInInitializerError("Failed to generate AES key");
@@ -84,7 +84,7 @@ private byte[] getOrCreateAesKey(String aesKeyPath) {
             }
         }
 
-        byte[] aesKey = FileHelper.readFileBytes(aesKeyPath);
+        final byte[] aesKey = FileHelper.readFileBytes(aesKeyPath);
 
         if (aesKey == null) {
             throw new ExceptionInInitializerError("Failed to load AES key");
@@ -98,7 +98,7 @@ private byte[] getOrCreateAesKey(String aesKeyPath) {
 
     public String encrypt(String data) {
         if (StringUtils.isNotBlank(data)) {
-            byte[] encryptedData = CipherHelper.aesEncrypt(data.getBytes(), aesKey);
+            final byte[] encryptedData = CipherHelper.aesEncrypt(data.getBytes(), aesKey);
             if (encryptedData != null) {
                 return new String(encryptedData);
             }
@@ -108,7 +108,7 @@ public String encrypt(String data) {
 
     public String decrypt(String encryptedData) {
         if (StringUtils.isNotBlank(encryptedData)) {
-            byte[] decryptedData = CipherHelper.aesDecrypt(encryptedData.getBytes(), aesKey);
+            final byte[] decryptedData = CipherHelper.aesDecrypt(encryptedData.getBytes(), aesKey);
             if (decryptedData != null) {
                 return new String(decryptedData);
             }