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;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fmodel%2FMirrorMaker.java;h=e693afe9b970a1f184a148d6a504401109cc6381;hp=6447123e6352e3b33443b339af130523c0d9f7c2;hb=1360b9df89a422d51ef40644ea5f9cf52cb84c6f;hpb=0e39c2d9a88a26693de1cd522766df5894917b3f 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 6447123..e693afe 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java +++ b/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java @@ -29,7 +29,7 @@ import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.service.MirrorMakerService; public class MirrorMaker extends DmaapObject { - static final Logger logger = Logger.getLogger(MirrorMaker.class); + private String sourceCluster; private String targetCluster; @@ -41,8 +41,20 @@ public class MirrorMaker extends DmaapObject { public MirrorMaker(){ } - + public MirrorMaker(String source, String target, int i) { + initMM( source, target ); + // original mm names did not have any index, so leave off index 0 for + // backwards compatibility + if ( i != 0 ) { + String n = this.getMmName() + "_" + i; + this.setMmName(n); + } + } public MirrorMaker(String source, String target) { + initMM( source, target ); + } + + private void initMM(String source, String target) { sourceCluster = source; targetCluster = target; mmName = genKey(source, target); @@ -72,7 +84,7 @@ public class MirrorMaker extends DmaapObject { } } */ - public String updateWhiteList() { + public String getWhitelistUpdateJSON() { StringBuilder str = new StringBuilder( "{ \"messageID\": \"" + MirrorMakerService.genTransactionId() + "\", \"updateWhiteList\": {" ); str.append( " \"name\": \"" + this.getMmName() + "\", \"whitelist\": \"" ); int numTargets = 0; @@ -109,9 +121,9 @@ public class MirrorMaker extends DmaapObject { StringBuilder str = new StringBuilder( "{ \"messageID\": \"" + MirrorMakerService.genTransactionId() + "\", \"createMirrorMaker\": {" ); str.append( " \"name\": \"" + this.getMmName() + "\", " ); str.append( " \"consumer\": \"" + this.sourceCluster + ":" + consumerPort + "\", " ); - str.append( " \"producer\": \"" + this.targetCluster + ":" + producerPort + "\" "); + str.append( " \"producer\": \"" + this.targetCluster + ":" + producerPort + "\", "); - str.append( " } }" ); + str.append( " \"numStreams\": \"10\" } }" ); return str.toString(); }