feat(client side state): Addressing points rais...

...ed in the code review
syndesisio · Jul 26, 2017 · 3c9984d · 3c9984d
1 parent f21f3c1
commit 3c9984d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,6 @@
     <junit.version>4.12</junit.version>
     <keycloak.version>2.5.4.Final</keycloak.version>
     <kubernetes.client.version>2.2.13</kubernetes.client.version>
-    <msgpack.version>0.8.13</msgpack.version>
     <mockwebserver.version>0.0.12</mockwebserver.version>
     <okhttp-eventsource.version>1.3.2</okhttp-eventsource.version>
     <postgresql.version>9.1-901-1.jdbc4</postgresql.version>

diff --git a/rest/pom.xml b/rest/pom.xml
@@ -174,11 +174,6 @@
       <artifactId>guava</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.msgpack</groupId>
-      <artifactId>jackson-dataformat-msgpack</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/rest/src/main/java/io/syndesis/rest/v1/state/ClientSideState.java b/rest/src/main/java/io/syndesis/rest/v1/state/ClientSideState.java
@@ -41,8 +41,6 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import org.msgpack.jackson.dataformat.MessagePackFactory;
-
 /**
  * Persists given state on the client with these properties:
  * <ul>
@@ -71,7 +69,7 @@ public final class ClientSideState {
 
     private static final int IV_LEN = 16;
 
-    private static final ObjectMapper MAPPER = new ObjectMapper(new MessagePackFactory());
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final Edition edition;
 
@@ -86,18 +84,12 @@ public final class ClientSideState {
     private final Supplier<Long> timeSource;
 
     protected static final class RandomIvSource implements Supplier<byte[]> {
-        private static final ThreadLocal<SecureRandom> RANDOM = new ThreadLocal<SecureRandom>() {
-            @Override
-            protected SecureRandom initialValue() {
-                return new SecureRandom();
-            }
-        };
+        private static final SecureRandom RANDOM = new SecureRandom();
 
         @Override
         public byte[] get() {
-            final SecureRandom secureRandom = RANDOM.get();
             final byte[] iv = new byte[IV_LEN];
-            secureRandom.nextBytes(iv);
+            RANDOM.nextBytes(iv);
 
             return iv;
         }

diff --git a/runtime/src/main/resources/application.yml b/runtime/src/main/resources/application.yml
@@ -80,11 +80,3 @@ generator:
 controllers:
   integration:
     enabled: true
-
-client:
-  state:
-    authenticationAlgorithm: HmacSHA1
-    authenticationKey: oNXU5SBpNnU1UI/4ZkUAA2Gzikc=
-    encryptionAlgorithm: AES/CBC/PKCS5Padding
-    encryptionKey: IIAyKXfJTrIvjS6G9dHJLA==
-    tid: 1
diff --git a/runtime/src/test/java/io/syndesis/runtime/BaseITCase.java b/runtime/src/test/java/io/syndesis/runtime/BaseITCase.java
@@ -46,7 +46,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+    properties = {"client.state.authenticationAlgorithm=HmacSHA1",
+        "client.state.authenticationKey=oNXU5SBpNnU1UI/4ZkUAA2Gzikc=",
+        "client.state.encryptionAlgorithm=AES/CBC/PKCS5Padding", "client.state.encryptionKey=IIAyKXfJTrIvjS6G9dHJLA==",
+        "client.state.tid=1"})
 @ActiveProfiles("test")
 public abstract class BaseITCase {