Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95E21100FD for ; Tue, 5 Aug 2014 03:44:28 +0000 (UTC) Received: (qmail 39766 invoked by uid 500); 5 Aug 2014 03:44:28 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 39732 invoked by uid 500); 5 Aug 2014 03:44:28 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 39696 invoked by uid 99); 5 Aug 2014 03:44:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 03:44:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F2F82922625; Tue, 5 Aug 2014 03:44:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Tue, 05 Aug 2014 03:44:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: CURATOR-67 defer creation of serializer Repository: curator Updated Branches: refs/heads/master f5767c890 -> adb93c0ef CURATOR-67 defer creation of serializer Instead of immediately creating a new JSONInstanceSerializer we can defer until build() is actually called. This lets users specify their own serializers and avoids issues where there may be version conflicts. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/f24e11bd Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/f24e11bd Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/f24e11bd Branch: refs/heads/master Commit: f24e11bdc9ca45e94479b1c6fc981b8b7393f619 Parents: f5767c8 Author: Mike Drob Authored: Fri Aug 1 11:29:30 2014 -0500 Committer: Mike Drob Committed: Fri Aug 1 11:29:30 2014 -0500 ---------------------------------------------------------------------- .../x/discovery/ServiceDiscoveryBuilder.java | 7 +- .../details/TestServiceDiscoveryBuilder.java | 68 ++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/f24e11bd/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscoveryBuilder.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscoveryBuilder.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscoveryBuilder.java index ab62004..28fc31c 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscoveryBuilder.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceDiscoveryBuilder.java @@ -29,6 +29,7 @@ public class ServiceDiscoveryBuilder private String basePath; private InstanceSerializer serializer; private ServiceInstance thisInstance; + private Class payloadClass; /** * Return a new builder. The builder will be defaulted with a {@link JsonInstanceSerializer}. @@ -39,7 +40,7 @@ public class ServiceDiscoveryBuilder */ public static ServiceDiscoveryBuilder builder(Class payloadClass) { - return new ServiceDiscoveryBuilder(payloadClass).serializer(new JsonInstanceSerializer(payloadClass)); + return new ServiceDiscoveryBuilder(payloadClass); } /** @@ -49,6 +50,9 @@ public class ServiceDiscoveryBuilder */ public ServiceDiscovery build() { + if ( serializer == null ) { + serializer(new JsonInstanceSerializer(payloadClass)); + } return new ServiceDiscoveryImpl(client, basePath, serializer, thisInstance); } @@ -102,5 +106,6 @@ public class ServiceDiscoveryBuilder ServiceDiscoveryBuilder(Class payloadClass) { + this.payloadClass = payloadClass; } } http://git-wip-us.apache.org/repos/asf/curator/blob/f24e11bd/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/details/TestServiceDiscoveryBuilder.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/details/TestServiceDiscoveryBuilder.java b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/details/TestServiceDiscoveryBuilder.java new file mode 100644 index 0000000..072eabf --- /dev/null +++ b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/details/TestServiceDiscoveryBuilder.java @@ -0,0 +1,68 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.curator.x.discovery.details; + +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.retry.RetryOneTime; +import org.apache.curator.test.BaseClassForTests; +import org.apache.curator.x.discovery.ServiceDiscoveryBuilder; +import org.apache.curator.x.discovery.ServiceInstance; +import org.testng.Assert; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +public class TestServiceDiscoveryBuilder extends BaseClassForTests +{ + @Test + public void testDefaultSerializer() throws Exception + { + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + ServiceDiscoveryBuilder builder = ServiceDiscoveryBuilder.builder(Object.class).client(client); + ServiceDiscoveryImpl discovery = (ServiceDiscoveryImpl) builder.basePath("/path").build(); + + Assert.assertNotNull(discovery.getSerializer(), "default serializer not set"); + Assert.assertTrue(discovery.getSerializer() instanceof JsonInstanceSerializer, "default serializer not JSON"); + } + + @Test + public void testSetSerializer() throws Exception + { + CuratorFramework client = CuratorFrameworkFactory.newClient(server.getConnectString(), new RetryOneTime(1)); + ServiceDiscoveryBuilder builder = ServiceDiscoveryBuilder.builder(Object.class).client(client); + builder.serializer(new InstanceSerializer() + { + @Override + public byte[] serialize(ServiceInstance instance) + { + return null; + } + + @Override + public ServiceInstance deserialize(byte[] bytes) + { + return null; + } + }); + + ServiceDiscoveryImpl discovery = (ServiceDiscoveryImpl) builder.basePath("/path").build(); + Assert.assertNotNull(discovery.getSerializer(), "default serializer not set"); + Assert.assertFalse(discovery.getSerializer() instanceof JsonInstanceSerializer, "set serializer is JSON"); + } +}