From c8a4c3745b2601e07cd6dde158ee8a87fb0eb51e Mon Sep 17 00:00:00 2001 From: arun-gupta Date: Fri, 12 Jun 2015 14:36:30 +0100 Subject: [PATCH] renaming service-registration to zookeeper, ServiceRegistration to ZooKeeper, fixing the deps --- microservice/catalog/pom.xml | 2 +- .../everest/catalog/CatalogService.java | 12 +++++----- microservice/everest/pom.xml | 2 +- .../everest/ServiceDiscoveryZooKeeper.java | 12 +++++----- microservice/order/pom.xml | 2 +- .../samples/everest/order/OrderService.java | 10 ++++----- microservice/pom.xml | 4 ++-- microservice/user/pom.xml | 2 +- .../samples/everest/uzer/UserService.java | 10 ++++----- microservice/{services => zookeeper}/pom.xml | 4 ++-- .../wildfly/samples/zookeeper/ZooKeeper.java} | 22 +++++++++---------- 11 files changed, 41 insertions(+), 41 deletions(-) rename microservice/{services => zookeeper}/pom.xml (90%) rename microservice/{services/src/main/java/org/javaee7/wildfly/samples/services/Services.java => zookeeper/src/main/java/org/javaee7/wildfly/samples/zookeeper/ZooKeeper.java} (85%) diff --git a/microservice/catalog/pom.xml b/microservice/catalog/pom.xml index c8eb580..0190e7e 100644 --- a/microservice/catalog/pom.xml +++ b/microservice/catalog/pom.xml @@ -19,7 +19,7 @@ org.javaee7.wildfly.samples - services + zookeeper diff --git a/microservice/catalog/src/main/java/org/javaee7/wildfly/samples/everest/catalog/CatalogService.java b/microservice/catalog/src/main/java/org/javaee7/wildfly/samples/everest/catalog/CatalogService.java index 31df9c1..36a10d7 100644 --- a/microservice/catalog/src/main/java/org/javaee7/wildfly/samples/everest/catalog/CatalogService.java +++ b/microservice/catalog/src/main/java/org/javaee7/wildfly/samples/everest/catalog/CatalogService.java @@ -4,7 +4,7 @@ import javax.annotation.PreDestroy; import javax.ejb.Singleton; import javax.ejb.Startup; -import org.javaee7.wildfly.samples.services.Services; +import org.javaee7.wildfly.samples.zookeeper.ZooKeeper; /** * @author arungupta @@ -12,16 +12,16 @@ @Startup @Singleton public class CatalogService { - Services service; + ZooKeeper zk; @PostConstruct public void registerService() { - service = Services.getInstance("192.168.99.103", 2181); - service.registerService("catalog", "http://localhost:8080/catalog/resources/catalog"); + zk = ZooKeeper.getInstance("192.168.99.103", 2181); + zk.registerService("catalog", "http://localhost:8080/catalog/resources/catalog"); } @PreDestroy - public void stopService() { - service.registerService("catalog", "http://localhost:8080/catalog/resources/catalog"); + public void unregisterService() { + zk.unregisterService("catalog", "http://localhost:8080/catalog/resources/catalog"); } } diff --git a/microservice/everest/pom.xml b/microservice/everest/pom.xml index 1988eab..315fc37 100644 --- a/microservice/everest/pom.xml +++ b/microservice/everest/pom.xml @@ -19,7 +19,7 @@ org.javaee7.wildfly.samples - services + zookeeper org.javaee7.wildfly.samples diff --git a/microservice/everest/src/main/java/org/javaee7/wildfly/samples/everest/ServiceDiscoveryZooKeeper.java b/microservice/everest/src/main/java/org/javaee7/wildfly/samples/everest/ServiceDiscoveryZooKeeper.java index 123a5ac..b4c1ace 100644 --- a/microservice/everest/src/main/java/org/javaee7/wildfly/samples/everest/ServiceDiscoveryZooKeeper.java +++ b/microservice/everest/src/main/java/org/javaee7/wildfly/samples/everest/ServiceDiscoveryZooKeeper.java @@ -2,7 +2,7 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; -import org.javaee7.wildfly.samples.services.Services; +import org.javaee7.wildfly.samples.zookeeper.ZooKeeper; /** * @author arungupta @@ -10,25 +10,25 @@ @ApplicationScoped public class ServiceDiscoveryZooKeeper implements ServiceDiscoveryURI { - Services service; + ZooKeeper zk; @PostConstruct public void init() { - service = Services.getInstance("192.168.99.103", 2181); + zk = ZooKeeper.getInstance("192.168.99.103", 2181); } @Override public String getUserServiceURI() { - return service.discoverService("user"); + return zk.discoverService("user"); } @Override public String getCatalogServiceURI() { - return service.discoverService("catalog"); + return zk.discoverService("catalog"); } @Override public String getOrderServiceURI() { - return service.discoverService("order"); + return zk.discoverService("order"); } } diff --git a/microservice/order/pom.xml b/microservice/order/pom.xml index fdc4faa..f267e9e 100644 --- a/microservice/order/pom.xml +++ b/microservice/order/pom.xml @@ -19,7 +19,7 @@ org.javaee7.wildfly.samples - services + zookeeper diff --git a/microservice/order/src/main/java/org/javaee7/wildfly/samples/everest/order/OrderService.java b/microservice/order/src/main/java/org/javaee7/wildfly/samples/everest/order/OrderService.java index 2b6d0b3..6400538 100644 --- a/microservice/order/src/main/java/org/javaee7/wildfly/samples/everest/order/OrderService.java +++ b/microservice/order/src/main/java/org/javaee7/wildfly/samples/everest/order/OrderService.java @@ -4,7 +4,7 @@ import javax.annotation.PreDestroy; import javax.ejb.Singleton; import javax.ejb.Startup; -import org.javaee7.wildfly.samples.services.Services; +import org.javaee7.wildfly.samples.zookeeper.ZooKeeper; /** * @author arungupta @@ -12,16 +12,16 @@ @Startup @Singleton public class OrderService { - Services service; + ZooKeeper zk; @PostConstruct public void registerService() { - service = Services.getInstance("192.168.99.103", 2181); - service.registerService("order", "http://localhost:8080/order/resources/order"); + zk = ZooKeeper.getInstance("192.168.99.103", 2181); + zk.registerService("order", "http://localhost:8080/order/resources/order"); } @PreDestroy public void stopService() { - service.unregisterService("order", "http://localhost:8080/order/resources/order"); + zk.unregisterService("order", "http://localhost:8080/order/resources/order"); } } diff --git a/microservice/pom.xml b/microservice/pom.xml index 2ebc700..554b53c 100644 --- a/microservice/pom.xml +++ b/microservice/pom.xml @@ -14,7 +14,7 @@ user order everest - services + zookeeper Shopping Cart Microservice @@ -30,7 +30,7 @@ org.javaee7.wildfly.samples - services + zookeeper 1.0-SNAPSHOT diff --git a/microservice/user/pom.xml b/microservice/user/pom.xml index 43a02dc..0437369 100644 --- a/microservice/user/pom.xml +++ b/microservice/user/pom.xml @@ -19,7 +19,7 @@ org.javaee7.wildfly.samples - services + zookeeper diff --git a/microservice/user/src/main/java/org/javaee7/wildfly/samples/everest/uzer/UserService.java b/microservice/user/src/main/java/org/javaee7/wildfly/samples/everest/uzer/UserService.java index 0b08f19..04d21ec 100644 --- a/microservice/user/src/main/java/org/javaee7/wildfly/samples/everest/uzer/UserService.java +++ b/microservice/user/src/main/java/org/javaee7/wildfly/samples/everest/uzer/UserService.java @@ -4,7 +4,7 @@ import javax.annotation.PreDestroy; import javax.ejb.Singleton; import javax.ejb.Startup; -import org.javaee7.wildfly.samples.services.Services; +import org.javaee7.wildfly.samples.zookeeper.ZooKeeper; /** * @author arungupta @@ -12,16 +12,16 @@ @Startup @Singleton public class UserService { - Services service; + ZooKeeper zk; @PostConstruct public void registerService() { - service = Services.getInstance("192.168.99.103", 2181); - service.registerService("user", "http://localhost:8080/user/resources/user"); + zk = ZooKeeper.getInstance("192.168.99.103", 2181); + zk.registerService("user", "http://localhost:8080/user/resources/user"); } @PreDestroy public void stopService() { - service.unregisterService("user", "http://localhost:8080/user/resources/user"); + zk.unregisterService("user", "http://localhost:8080/user/resources/user"); } } diff --git a/microservice/services/pom.xml b/microservice/zookeeper/pom.xml similarity index 90% rename from microservice/services/pom.xml rename to microservice/zookeeper/pom.xml index 63d6f74..387d072 100644 --- a/microservice/services/pom.xml +++ b/microservice/zookeeper/pom.xml @@ -8,7 +8,7 @@ ../pom.xml - services + zookeeper jar @@ -16,5 +16,5 @@ curator-framework - services + zookeeper \ No newline at end of file diff --git a/microservice/services/src/main/java/org/javaee7/wildfly/samples/services/Services.java b/microservice/zookeeper/src/main/java/org/javaee7/wildfly/samples/zookeeper/ZooKeeper.java similarity index 85% rename from microservice/services/src/main/java/org/javaee7/wildfly/samples/services/Services.java rename to microservice/zookeeper/src/main/java/org/javaee7/wildfly/samples/zookeeper/ZooKeeper.java index f9bfc30..c3ece34 100644 --- a/microservice/services/src/main/java/org/javaee7/wildfly/samples/services/Services.java +++ b/microservice/zookeeper/src/main/java/org/javaee7/wildfly/samples/zookeeper/ZooKeeper.java @@ -1,4 +1,4 @@ -package org.javaee7.wildfly.samples.services; +package org.javaee7.wildfly.samples.zookeeper; import java.util.List; import org.apache.curator.framework.CuratorFramework; @@ -10,24 +10,24 @@ /** * @author arungupta */ -public class Services { +public class ZooKeeper { - private static Services INSTANCE; - private static String zkHost; - private static int zkPort; + private static ZooKeeper INSTANCE; + private static String host; + private static int port; - public static final Services getInstance(String zkHost, int zkPort) { + public static final ZooKeeper getInstance(String host, int port) { if (null == INSTANCE) { - INSTANCE = new Services(); - Services.zkHost = zkHost; - Services.zkPort = zkPort; + INSTANCE = new ZooKeeper(); + ZooKeeper.host = host; + ZooKeeper.port = port; } return INSTANCE; } public void registerService(String name, String uri) { try { - CuratorFramework curatorFramework = CuratorFrameworkFactory.newClient(zkHost + ":" + zkPort, new RetryNTimes(5, 1000)); + CuratorFramework curatorFramework = CuratorFrameworkFactory.newClient(host + ":" + port, new RetryNTimes(5, 1000)); curatorFramework.start(); String znode = "/services/" + name; @@ -61,7 +61,7 @@ public void unregisterService(String name, String uri) { public String discoverService(String name) { try { - CuratorFramework curatorFramework = CuratorFrameworkFactory.newClient(zkHost + ":" + zkPort, new RetryNTimes(5, 1000)); + CuratorFramework curatorFramework = CuratorFrameworkFactory.newClient(host + ":" + port, new RetryNTimes(5, 1000)); curatorFramework.start(); String znode = "/services/" + name;