X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fmodel%2FMirrorMaker.java;h=6447123e6352e3b33443b339af130523c0d9f7c2;hp=1e381b8444bdea1363c2a5b4a93a61b540eccea6;hb=1611944a45491e2b8f00606b0aac2cdb0de8dde8;hpb=ad29261e05ff057134d48b7d6a99da1cd07849e0

diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java b/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java
index 1e381b8..6447123 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java
@@ -36,7 +36,6 @@ public class MirrorMaker extends DmaapObject {
 	private String	mmName;
 	private	ArrayList<String> topics;  //re-using this var name for backwards DB compatibility
 	
-	private Set<ReplicationVector> vectors;
 
 	
 	public MirrorMaker(){
@@ -47,7 +46,6 @@ public class MirrorMaker extends DmaapObject {
 		sourceCluster = source;
 		targetCluster = target;
 		mmName = genKey(source, target);
-		vectors = new HashSet<ReplicationVector>();
 		topics = new ArrayList<String>();
 
 	}
@@ -61,36 +59,6 @@ public class MirrorMaker extends DmaapObject {
 	}
 
 	
-	public void addVector( String fqtn, String source, String target ) {
-		logger.info( "addVector: fqtn=" + fqtn + " source=" + source + " target=" + target );
-		if ( ! sourceCluster.equals( source ) ){
-			errorLogger.error( DmaapbcLogMessageEnum.MM_CIRCULAR_REF,  source,  sourceCluster );
-		}
-		vectors.add(new ReplicationVector( fqtn, source, target ));
-	}
-	
-	public void delVector( String fqtn, String source, String target ) {
-		vectors.remove(new ReplicationVector( fqtn, source, target));
-	}
-
-	
-	
-	public String toJSON() {
-		StringBuilder str = new StringBuilder( "{ \"source\": " + sourceCluster + ",\"topics\": ["  );
-		int numTargets = 0;
-		for (ReplicationVector rv: vectors) {
-			if ( numTargets > 0 ) {
-				str.append( ",");
-			}
-			str.append( " \"target\": " + rv.getTargetCluster() + ", \"topic\": " + rv.getFqtn());
-			numTargets++;
-		}
-		str.append( "] }" );
-		
-		return str.toString();
-	}
-		
-	
 	// returns the JSON for MM message containing which Topics to replicate
 	/* 
 	 * example:
@@ -166,18 +134,11 @@ public class MirrorMaker extends DmaapObject {
 	}
 
 
-	public Set<ReplicationVector> getVectors() {
-		return vectors;
-	}
-
-	public void setVectors(Set<ReplicationVector> vectors) {
-		this.vectors = vectors;
-	}
 	public ArrayList<String> getTopics() {
 		return topics;
 	}
 
-	//public void setVectors(Set<ReplicationVector> vectors) {
+	
 	public void setTopics(ArrayList<String> topics) {
 		this.topics = topics;
 	}
@@ -194,7 +155,10 @@ public class MirrorMaker extends DmaapObject {
 
 	
 	public void addTopic( String topic ) {
-		topics.add(topic);
+		if ( ! topics.contains(topic)) {	
+			topics.add(topic);
+		}
+		logger.info( "Mirrormaker.addTopic: topic=" + topic + " . Now have " + topics.size() + " topics" );
 	}
 	
 	public int getTopicCount() {