SLIDER-149 java 5 template pain
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b26863ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b26863ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b26863ab Branch: refs/heads/develop Commit: b26863ab63b20c6f008728dc0c5827a05b37c5cb Parents: a06d5ed Author: Steve Loughran <ste...@apache.org> Authored: Tue Sep 23 21:53:57 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Sep 23 21:53:57 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/slider/core/persist/JsonSerDeser.java | 2 +- .../slider/server/services/curator/RegistryBinderService.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b26863ab/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java b/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java index 97be41d..f77d6df 100644 --- a/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java +++ b/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java @@ -56,7 +56,7 @@ public class JsonSerDeser<T> { /** * Create an instance bound to a specific type - * @param classType + * @param classType class type */ public JsonSerDeser(Class<T> classType) { this.classType = classType; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b26863ab/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java index b3e2ff2..dbdcee4 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java @@ -27,7 +27,6 @@ import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceInstanceBuilder; import org.apache.curator.x.discovery.ServiceType; import org.apache.curator.x.discovery.UriSpec; -import org.apache.slider.core.exceptions.BadClusterStateException; import org.apache.slider.core.persist.JsonSerDeser; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; @@ -56,8 +55,8 @@ public class RegistryBinderService<Payload> extends CuratorService { private final Map<String, ServiceInstance<Payload>> entries = new HashMap<String, ServiceInstance<Payload>>(); - private JsonSerDeser<CuratorServiceInstance<Payload>> deser = - new JsonSerDeser<CuratorServiceInstance<Payload>>(CuratorServiceInstance.class); + private JsonSerDeser<CuratorServiceInstance> deser = + new JsonSerDeser<CuratorServiceInstance>(CuratorServiceInstance.class); /** * Create an instance