This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 820789a GEODE-8103: Renames SniSocketFactory to SniProxySocketFactory
(#5092)
820789a is described below
commit 820789a3e7e6c538c01c772e15b8ff817cfa8d97
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Mon May 11 15:25:05 2020 -0700
GEODE-8103: Renames SniSocketFactory to SniProxySocketFactory (#5092)
(cherry picked from commit 4c5788d3b1b37bd284e93fdda4b78486aad7c9b8)
---
.../src/integrationTest/resources/assembly_content.txt | 2 +-
.../apache/geode/cache/client/ClientCacheFactoryJUnitTest.java | 10 +++++-----
.../cache/client/ClientCacheFactoryJUnitTest_single_pool.xml | 2 +-
.../apache/geode/cache/client/proxy/ProxySocketFactories.java | 2 +-
.../{SniSocketFactory.java => SniProxySocketFactory.java} | 6 +++---
geode-docs/reference/topics/client-cache.html.md.erb | 2 +-
.../setting_up_a_client_server_system.html.md.erb | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 5beafe5..610343c 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -288,7 +288,7 @@ javadoc/org/apache/geode/cache/client/package-frame.html
javadoc/org/apache/geode/cache/client/package-summary.html
javadoc/org/apache/geode/cache/client/package-tree.html
javadoc/org/apache/geode/cache/client/proxy/ProxySocketFactories.html
-javadoc/org/apache/geode/cache/client/proxy/SniSocketFactory.html
+javadoc/org/apache/geode/cache/client/proxy/SniProxySocketFactory.html
javadoc/org/apache/geode/cache/client/proxy/package-frame.html
javadoc/org/apache/geode/cache/client/proxy/package-summary.html
javadoc/org/apache/geode/cache/client/proxy/package-tree.html
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index 0ca9a0c..e914f0f 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -52,7 +52,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.client.internal.ProxyCache;
import org.apache.geode.cache.client.internal.UserAttributes;
-import org.apache.geode.cache.client.proxy.SniSocketFactory;
+import org.apache.geode.cache.client.proxy.SniProxySocketFactory;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -153,10 +153,10 @@ public class ClientCacheFactoryJUnitTest {
// verify that the SocketCreator settings were correctly picked up from
the xml file
SocketFactory factory = defPool.getSocketFactory();
- assertThat(factory).isInstanceOf(SniSocketFactory.class);
- SniSocketFactory sniSocketFactory = (SniSocketFactory) factory;
- assertThat(sniSocketFactory.getPort()).isEqualTo(40404);
- assertThat(sniSocketFactory.getHostname()).isEqualTo("localhost");
+ assertThat(factory).isInstanceOf(SniProxySocketFactory.class);
+ SniProxySocketFactory sniProxySocketFactory = (SniProxySocketFactory)
factory;
+ assertThat(sniProxySocketFactory.getPort()).isEqualTo(40404);
+ assertThat(sniProxySocketFactory.getHostname()).isEqualTo("localhost");
}
/**
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
b/geode-core/src/integrationTest/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
index 82666d9..a2aa44f 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
@@ -28,7 +28,7 @@
<pool name="my_pool_name" multiuser-authentication="true">
<server host="localhost" port="40404"/>
<socket-factory>
-
<class-name>org.apache.geode.cache.client.proxy.SniSocketFactory</class-name>
+
<class-name>org.apache.geode.cache.client.proxy.SniProxySocketFactory</class-name>
<parameter name="hostname">
<string>localhost</string>
</parameter>
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
index 1271433..5ca01ad 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/ProxySocketFactories.java
@@ -27,6 +27,6 @@ public class ProxySocketFactories {
* @param port the port of the sni proxy
*/
public static SocketFactory sni(String hostname, int port) {
- return new SniSocketFactory(hostname, port);
+ return new SniProxySocketFactory(hostname, port);
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniSocketFactory.java
b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniProxySocketFactory.java
similarity index 90%
rename from
geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniSocketFactory.java
rename to
geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniProxySocketFactory.java
index 1123b76..025f371 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniSocketFactory.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/proxy/SniProxySocketFactory.java
@@ -29,15 +29,15 @@ import org.apache.geode.internal.DistributionLocator;
* A {@link SocketFactory} that connects a client to locators and servers
* through a SNI proxy.
*/
-public class SniSocketFactory implements SocketFactory, Declarable {
+public class SniProxySocketFactory implements SocketFactory, Declarable {
private String hostname;
private int port;
- public SniSocketFactory() {} // required by Declarable
+ public SniProxySocketFactory() {} // required by Declarable
- public SniSocketFactory(String hostname, int port) {
+ public SniProxySocketFactory(String hostname, int port) {
this.hostname = hostname;
this.port = port;
}
diff --git a/geode-docs/reference/topics/client-cache.html.md.erb
b/geode-docs/reference/topics/client-cache.html.md.erb
index ab3c0e8..f32ef24 100644
--- a/geode-docs/reference/topics/client-cache.html.md.erb
+++ b/geode-docs/reference/topics/client-cache.html.md.erb
@@ -354,7 +354,7 @@ This setting may be used with either a Server list or a
Locator list. It will b
``` pre
<pool ...>
<socket-factory>
-
<class-name>org.apache.geode.cache.client.proxy.SniSocketFactory</class-name>
+
<class-name>org.apache.geode.cache.client.proxy.SniProxySocketFactory</class-name>
<parameter name="hostname">
<string>my-gateway-address</string>
</parameter>
diff --git
a/geode-docs/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html.md.erb
b/geode-docs/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html.md.erb
index a9c82c1..32abde7 100644
---
a/geode-docs/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html.md.erb
+++
b/geode-docs/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html.md.erb
@@ -65,7 +65,7 @@ Configure your server and client processes and data regions
to run your client/s
When TLS (SSL) is used clients can also be directed to go through a SNI
gateway such as Istio or HAProxy to reach locators and servers. To do this add
the following to your cache.xml pool configuration:
<pool... >
<socket-factory>
-
<class-name>org.apache.geode.cache.client.proxy.SniSocketFactory</class-name>
+
<class-name>org.apache.geode.cache.client.proxy.SniProxySocketFactory</class-name>
<parameter name="hostname">
<string>my-gateway-address</string>
</parameter>
