This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 53779a3822216a711ed7b1a1057366878a407144 Author: Amichai Rothman <[email protected]> AuthorDate: Mon May 27 16:58:27 2024 +0300 Standardize case in class names --- examples/echotcp/Readme.md | 2 +- .../org/apache/aries/rsa/provider/tcp/TcpEndpoint.java | 4 ++-- .../provider/tcp/{TCPProvider.java => TcpProvider.java} | 14 +++++++------- .../rsa/provider/tcp/{TCPServer.java => TcpServer.java} | 6 +++--- .../aries/rsa/provider/tcp/TcpProviderIntentTest.java | 4 ++-- .../aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java | 2 +- .../org/apache/aries/rsa/provider/tcp/TcpProviderTest.java | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/echotcp/Readme.md b/examples/echotcp/Readme.md index 0fcb4e9f..9e460ae8 100644 --- a/examples/echotcp/Readme.md +++ b/examples/echotcp/Readme.md @@ -43,6 +43,6 @@ The log should show that the discovery picks up the endpoint from zookeeper and ``` 2016-03-14 12:03:30,518 | INFO | er])-EventThread | InterfaceMonitor | 54 - org.apache.aries.rsa.discovery.zookeeper - 1.8.0.SNAPSHOT | found new node /osgi/service_registry/org/apache/aries/rsa/examples/echotcp/api/EchoService/[192.168.0.129#36384#] ( []->child ) props: [1, org.apache.aries.rsa.examples.echotcp.service.EchoServiceImpl, 2b242970-0d54-49c4-a321-b0c323809c24, tcp://192.168.0.129:36384, 1.0.0, 138, [Ljava.lang.String;@69a6817f, 64, true, [Ljava.lang.Stri [...] 2016-03-14 12:03:30,520 | INFO | er])-EventThread | InterfaceMonitorManager | 54 - org.apache.aries.rsa.discovery.zookeeper - 1.8.0.SNAPSHOT | calling EndpointListener.endpointAdded: org.apache.aries.rsa.topologymanager.importer.TopologyManagerImport@2366e9c8 from bundle org.apache.aries.rsa.topology-manager for endpoint: {component.id=1, component.name=org.apache.aries.rsa.examples.echotcp.service.EchoServiceImpl, endpoint.framework.uuid=2b242970-0d54-49c4-a321-b0c323809c24, e [...] -2016-03-14 12:03:30,522 | INFO | pool-41-thread-1 | RemoteServiceAdminCore | 52 - org.apache.aries.rsa.core - 1.8.0.SNAPSHOT | Importing service tcp://192.168.0.129:36384 with interfaces [org.apache.aries.rsa.examples.echotcp.api.EchoService] using handler class org.apache.aries.rsa.provider.tcp.TCPProvider. +2016-03-14 12:03:30,522 | INFO | pool-41-thread-1 | RemoteServiceAdminCore | 52 - org.apache.aries.rsa.core - 1.8.0.SNAPSHOT | Importing service tcp://192.168.0.129:36384 with interfaces [org.apache.aries.rsa.examples.echotcp.api.EchoService] using handler class org.apache.aries.rsa.provider.tcp.TcpProvider. ``` diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java index 73d1dfdc..a29cdbfe 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpEndpoint.java @@ -41,7 +41,7 @@ public class TcpEndpoint implements Endpoint { if (service == null) { throw new NullPointerException("Service must not be null"); } - if (effectiveProperties.get(TCPProvider.TCP_CONFIG_TYPE + ".id") != null) { + if (effectiveProperties.get(TcpProvider.TCP_CONFIG_TYPE + ".id") != null) { throw new IllegalArgumentException("For the tck .. Just to please you!"); } this.closeCallback = closeCallback; @@ -61,7 +61,7 @@ public class TcpEndpoint implements Endpoint { effectiveProperties.put(RemoteConstants.SERVICE_INTENTS, Arrays.asList("osgi.basic", "osgi.async")); // tck tests for one such property ... so we provide it - effectiveProperties.put(TCPProvider.TCP_CONFIG_TYPE + ".id", endpointId); + effectiveProperties.put(TcpProvider.TCP_CONFIG_TYPE + ".id", endpointId); this.epd = new EndpointDescription(effectiveProperties); } diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpProvider.java similarity index 92% rename from provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java rename to provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpProvider.java index bdc85053..4b0ea489 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPProvider.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpProvider.java @@ -46,15 +46,15 @@ import org.slf4j.LoggerFactory; @Component(property = { // RemoteConstants.REMOTE_INTENTS_SUPPORTED + "=osgi.basic", RemoteConstants.REMOTE_INTENTS_SUPPORTED + "=osgi.async", - RemoteConstants.REMOTE_CONFIGS_SUPPORTED + "=" + TCPProvider.TCP_CONFIG_TYPE // + RemoteConstants.REMOTE_CONFIGS_SUPPORTED + "=" + TcpProvider.TCP_CONFIG_TYPE // }) -public class TCPProvider implements DistributionProvider { +public class TcpProvider implements DistributionProvider { static final String TCP_CONFIG_TYPE = "aries.tcp"; private static final String[] SUPPORTED_INTENTS = { "osgi.basic", "osgi.async"}; - private Logger logger = LoggerFactory.getLogger(TCPProvider.class); + private Logger logger = LoggerFactory.getLogger(TcpProvider.class); - private Map<Integer, TCPServer> servers = new HashMap<>(); + private Map<Integer, TcpServer> servers = new HashMap<>(); @Override public String[] getSupportedTypes() { @@ -91,9 +91,9 @@ public class TCPProvider implements DistributionProvider { private synchronized void addServer(Object serviceO, TcpEndpoint endpoint) { // port 0 means dynamically allocated free port int port = endpoint.getPort(); - TCPServer server = servers.get(port); + TcpServer server = servers.get(port); if (server == null || port == 0) { - server = new TCPServer(endpoint.getHostname(), port, endpoint.getNumThreads()); + server = new TcpServer(endpoint.getHostname(), port, endpoint.getNumThreads()); port = server.getPort(); // get the real port endpoint.setPort(port); servers.put(port, server); @@ -106,7 +106,7 @@ public class TCPProvider implements DistributionProvider { } private synchronized void removeServer(TcpEndpoint endpoint) { - TCPServer server = servers.get(endpoint.getPort()); + TcpServer server = servers.get(endpoint.getPort()); server.removeService(endpoint.description().getId()); if (server.isEmpty()) { try { diff --git a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPServer.java b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java similarity index 97% rename from provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPServer.java rename to provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java index 93824222..52ea8920 100644 --- a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TCPServer.java +++ b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpServer.java @@ -35,14 +35,14 @@ import org.osgi.util.promise.Promise; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TCPServer implements Closeable, Runnable { - private Logger log = LoggerFactory.getLogger(TCPServer.class); +public class TcpServer implements Closeable, Runnable { + private Logger log = LoggerFactory.getLogger(TcpServer.class); private ServerSocket serverSocket; private Map<String, MethodInvoker> invokers = new ConcurrentHashMap<>(); private volatile boolean running; private ThreadPoolExecutor executor; - public TCPServer(String localip, int port, int numThreads) { + public TcpServer(String localip, int port, int numThreads) { try { this.serverSocket = new ServerSocket(port); this.serverSocket.setReuseAddress(true); diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java index b2486ba6..672b77a9 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderIntentTest.java @@ -39,14 +39,14 @@ import org.osgi.service.remoteserviceadmin.RemoteConstants; public class TcpProviderIntentTest { Class<?>[] exportedInterfaces; private BundleContext bc; - private TCPProvider provider; + private TcpProvider provider; private MyService myService; @Before public void before() { exportedInterfaces = new Class[] {MyService.class}; bc = EasyMock.mock(BundleContext.class); - provider = new TCPProvider(); + provider = new TcpProvider(); myService = new MyServiceImpl(null); } diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java index af2dca87..b1442c5e 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderPrimitiveTest.java @@ -56,7 +56,7 @@ public class TcpProviderPrimitiveTest { @BeforeClass public static void createServerAndProxy() { Class<?>[] exportedInterfaces = new Class[] {PrimitiveService.class}; - TCPProvider provider = new TCPProvider(); + TcpProvider provider = new TcpProvider(); Map<String, Object> props = new HashMap<>(); EndpointHelper.addObjectClass(props, exportedInterfaces); props.put("aries.rsa.hostname", "localhost"); diff --git a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java index 600506e6..2fe59eae 100644 --- a/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java +++ b/provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/TcpProviderTest.java @@ -79,7 +79,7 @@ public class TcpProviderTest { @BeforeClass public static void createServerAndProxy() throws IOException { Class<?>[] exportedInterfaces = new Class[] {MyService.class}; - TCPProvider provider = new TCPProvider(); + TcpProvider provider = new TcpProvider(); Map<String, Object> props = new HashMap<>(); EndpointHelper.addObjectClass(props, exportedInterfaces); int port = getFreePort();
