Merge branch '2.x'

cloudfoundry · Aug 17, 2017 · 624456b · 624456b
2 parents 5022607 + 8450add
commit 624456b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml b/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
@@ -13,17 +13,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.12.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.12.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.9" level="project" />
@@ -51,7 +40,7 @@
     <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.7.0.M1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.7.0.BUILD-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.8.0" level="project" />

diff --git a/...ndry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java b/...ndry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java
@@ -86,6 +86,9 @@ public HttpClient getHttpClient() {
             getConnectTimeout().ifPresent(socketTimeout -> options.option(CONNECT_TIMEOUT_MILLIS, (int) socketTimeout.toMillis()));
             getKeepAlive().ifPresent(keepAlive -> options.option(SO_KEEPALIVE, keepAlive));
             getSslHandshakeTimeout().ifPresent(options::sslHandshakeTimeout);
+// TODO: Add back once these options show up in 0.7.0
+//            getSslCloseNotifyFlushTimeout().ifPresent(options::sslCloseNotifyFlushTimeout);
+//            getSslCloseNotifyReadTimeout().ifPresent(options::sslCloseNotifyReadTimeout);
             getProxyConfiguration().ifPresent(c -> c.configure(options));
         });
     }
@@ -178,6 +181,16 @@ Optional<SslCertificateTruster> getSslCertificateTruster() {
         }
     }
 
+    /**
+     * The timeout for the SSL close notify flush
+     */
+    abstract Optional<Duration> getSslCloseNotifyFlushTimeout();
+
+    /**
+     * THe timeout for the SSL close notify read
+     */
+    abstract Optional<Duration> getSslCloseNotifyReadTimeout();
+
     /**
      * The timeout for the SSL handshake negotiation
      */

diff --git a/integration-test/integration-test.iml b/integration-test/integration-test.iml
@@ -15,17 +15,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.12.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.12.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.0.BUILD-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.1.0.BUILD-SNAPSHOT" level="project" />
@@ -52,7 +41,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc:0.7.0.M1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc:0.7.0.BUILD-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="cloudfoundry-client" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />