Alternative MR replication method

This introduces a new set of replication rules for topics:
REPLICATION_EDGE_TO_FQDN
REPLICATION_FQDN_TO_EDGE
REPLICATION_EDFE_TO_FQDN_TO_GLOBAL
REPLICTION_GLOBAL_TO_FQDN_TO_EDGE

This will allow for some apps to design their own message replication
path for resiliency because it will use the FQDN of the cluster
instead of the using the CNAME.

Also contains:
- introduce (optional) replicationGroup field to mr_cluster
- some cleanup of unused code.

Change-Id: I063fb343af3f7bc17c88190563920afd84737ada
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-542

3 files changed, 3 insertions, 99 deletions

diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/MirrorMakerTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/MirrorMakerTest.java
index 8b632ed..547bfc9 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/MirrorMakerTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/MirrorMakerTest.java
@@ -83,8 +83,8 @@ public class MirrorMakerTest {
 		String p2 = "2081";
 		MirrorMaker t = new MirrorMaker( c1, c2 );
 		String m = t.getMmName();
+	
 
-		t.addVector( f, c1, c2 );
 		ArrayList<String> topics = new ArrayList<String>();
 		topics.add( f );
 		t.setTopics( topics );
@@ -92,14 +92,10 @@ public class MirrorMakerTest {
 
 		int i = t.getTopicCount();
 
-		String s = t.toJSON();
-
-		s = t.updateWhiteList();
+		String s = t.updateWhiteList();
 
 		s = t.createMirrorMaker(p1, p2);
 
-		t.delVector( f, c1, c2 );
-
 	}
 
 }
diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/ReplicationVectorTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/ReplicationVectorTest.java
deleted file mode 100644
index dde3b49..0000000
--- a/src/test/java/org/onap/dmaap/dbcapi/model/ReplicationVectorTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.onap.dmaap
- * ================================================================================
- * Copyright (C) 2018 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 org.onap.dmaap.dbcapi.model;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
-
-import java.util.ArrayList;
-
-
-public class ReplicationVectorTest {
-
-	private static final String  fmt = "%24s: %s%n";
-
-	ReflectionHarness rh = new ReflectionHarness();
-
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-
-	@Test
-	public void test1() {
-
-
-		rh.reflect( "org.onap.dmaap.dbcapi.model.ReplicationVector", "get", null );	
-	
-	}
-	@Test
-	public void test2() {
-
-		String v = "Validate";
-		rh.reflect( "org.onap.dmaap.dbcapi.model.ReplicationVector", "set", v );
-	}
-
-	@Test
-	public void test3() {
-		String f = "org.onap.interestingTopic";
-		String c1 =  "cluster1.onap.org";
-		String c2 =  "cluster2.onap.org";
-		ReplicationVector t = new ReplicationVector( f, c1, c2 );
-
-
-		assertTrue( f.equals( t.getFqtn() ));
-		assertTrue( c1.equals( t.getSourceCluster() ));
-		assertTrue( c2.equals( t.getTargetCluster() ));
-	}
-
-
-	@Test
-	public void test4() {
-		String f = "org.onap.interestingTopic";
-		String c1 =  "cluster1.onap.org";
-		String c2 =  "cluster2.onap.org";
-		ReplicationVector t = new ReplicationVector( f, c1, c2 );
-
-		int i = t.hashCode();
-
-		ReplicationVector t2 = new ReplicationVector(f, c1, c2 );
-
-		assertTrue( t.equals( t2 ));
-		assertTrue( t.equals( t ));
-		assertTrue( ! t.equals( f ));
-	}
-
-}
diff --git a/src/test/java/org/onap/dmaap/dbcapi/util/GraphTest.java b/src/test/java/org/onap/dmaap/dbcapi/util/GraphTest.java
index 7cedfac..449746a 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/util/GraphTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/util/GraphTest.java
@@ -89,7 +89,7 @@ public class GraphTest {
 
 		s = g.getCentralLoc();		
 		g.setHasCentral( true );
-		g.isHasCentral();
+		g.hasCentral();
 
 		hm = g.getGraph();