declared timeout field immutable

Signed-off-by: eric-lee-ltk <lidagang1@huawei.com>
apache · Oct 30, 2017 · 8c791fc · 8c791fc
1 parent 9555846
commit 8c791fc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -221,6 +221,12 @@
         <version>0.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${spring.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/transports/transport-httpclient-spring/pom.xml b/transports/transport-httpclient-spring/pom.xml
@@ -60,22 +60,18 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.seanyinx</groupId>
       <artifactId>unit-scaffolding</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/...client-spring/src/main/java/io/servicecomb/saga/transports/HttpClientTransportConfig.java b/...client-spring/src/main/java/io/servicecomb/saga/transports/HttpClientTransportConfig.java
@@ -26,8 +26,11 @@
 @Configuration
 public class HttpClientTransportConfig {
 
-  @Value("${saga.request.timeout:30000}")
-  private int requestTimeout;
+  private final int requestTimeout;
+
+  public HttpClientTransportConfig(@Value("${saga.request.timeout:30000}") int requestTimeout) {
+    this.requestTimeout = requestTimeout;
+  }
 
   @Bean
   @ConditionalOnMissingBean(RestTransport.class)

diff --git a/transports/transport-httpclient/pom.xml b/transports/transport-httpclient/pom.xml
@@ -47,17 +47,14 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-standalone</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.seanyinx</groupId>
       <artifactId>unit-scaffolding</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/...tpclient/src/main/java/io/servicecomb/saga/transports/httpclient/HttpClientTransport.java b/...tpclient/src/main/java/io/servicecomb/saga/transports/httpclient/HttpClientTransport.java
@@ -42,7 +42,7 @@
 @EnableKamon
 public class HttpClientTransport implements RestTransport {
 
-  private int requestTimeout;
+  private final int requestTimeout;
   private static final int DEFAULT_REQUEST_TIMEOUT = 30000;
 
   private static final Map<String, Function<URI, Request>> requestFactories = new HashMap<String, Function<URI, Request>>() {{