From 4aafa2c509c4bae82a2ed75c140eda9727c0cdf0 Mon Sep 17 00:00:00 2001 From: Sunil Unnava Date: Thu, 1 Mar 2018 16:05:12 -0500 Subject: added testcases for code coverage Issue-ID: DMAAP-271 Change-Id: I6b84ffcb3ce402e0df2cd3f3a4e60f11dffd4a47 Signed-off-by: Sunil Unnava --- .../nsa/cambria/beans/DMaaPKafkaMetaBroker.java | 9 +++--- .../com/att/nsa/cambria/beans/ZkClientFactory.java | 36 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/att/nsa/cambria/beans/ZkClientFactory.java (limited to 'src/main/java/com/att/nsa/cambria') diff --git a/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java index 9d53ef2..e7d777e 100644 --- a/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java +++ b/src/main/java/com/att/nsa/cambria/beans/DMaaPKafkaMetaBroker.java @@ -170,9 +170,7 @@ public class DMaaPKafkaMetaBroker implements Broker { // make Kafka aware of the // topic creation. (Otherwise, the topic is only partially // created in ZK.) - zkClient = new ZkClient(ConfigurationReader.getMainZookeeperConnectionString(), 10000, 10000, - ZKStringSerializer$.MODULE$); - + zkClient = ZkClientFactory.createZkClient(); log.info("Zookeeper client loaded successfully. Creating topic."); AdminUtils.createTopic(zkClient, topic, partitions, replicas, new Properties()); } catch (kafka.common.TopicExistsException e) { @@ -217,8 +215,7 @@ public class DMaaPKafkaMetaBroker implements Broker { // Kafka aware of the // topic creation. (Otherwise, the topic is only partially created // in ZK.) - zkClient = new ZkClient(ConfigurationReader.getMainZookeeperConnectionString(), 10000, 10000, - ZKStringSerializer$.MODULE$); + zkClient = ZkClientFactory.createZkClient(); log.info("Zookeeper client loaded successfully. Deleting topic."); AdminUtils.deleteTopic(zkClient, topic); @@ -245,6 +242,8 @@ public class DMaaPKafkaMetaBroker implements Broker { // throw new UnsupportedOperationException ( "We can't programmatically // delete Kafka topics yet." ); } + + //private final rrNvReadable fSettings; private final ZkClient fZk; diff --git a/src/main/java/com/att/nsa/cambria/beans/ZkClientFactory.java b/src/main/java/com/att/nsa/cambria/beans/ZkClientFactory.java new file mode 100644 index 0000000..2aedb95 --- /dev/null +++ b/src/main/java/com/att/nsa/cambria/beans/ZkClientFactory.java @@ -0,0 +1,36 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP Policy Engine + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ +package com.att.nsa.cambria.beans; + +import org.I0Itec.zkclient.ZkClient; + +import com.att.nsa.cambria.utils.ConfigurationReader; + +import kafka.utils.ZKStringSerializer$; + +public class ZkClientFactory { + + public static ZkClient createZkClient(){ + return new ZkClient(ConfigurationReader.getMainZookeeperConnectionString(), 10000, 10000, + ZKStringSerializer$.MODULE$); + + } + +} -- cgit 1.2.3-korg