<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.3.8.RC0</jettyVersion>
<eelf.version>1.0.0</eelf.version>
- <artifact.version>1.0.17-SNAPSHOT</artifact.version>
+ <artifact.version>1.0.18-SNAPSHOT</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response addFeed(
- @WebParam(name = "feed") Feed feed
+ @WebParam(name = "feed") Feed feed,
+ @QueryParam("useExisting") String useExisting
) {
ApiService resp = new ApiService();
return resp.error();
}
+
FeedService feedService = new FeedService();
Feed nfeed = feedService.getFeedByName( feed.getFeedName(), feed.getFeedVersion(), resp.getErr() );
if ( nfeed == null ) {
return resp.error();
}
+ } else if ( (useExisting != null) && ("true".compareToIgnoreCase( useExisting ) == 0)) {
+ return resp.success(nfeed);
}
resp.setCode(Status.CONFLICT.getStatusCode());
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response addTopic(
- Topic topic
+ Topic topic,
+ @QueryParam("useExisting") String useExisting
) {
- logger.info( "addTopic request: " + topic );
+ logger.info( "addTopic request: " + topic + " useExisting=" + useExisting );
ApiService check = new ApiService();
try {
topic.setFqtnStyle( defaultTopicStyle );
}
topic.setLastMod();
+ Boolean flag = false;
+ if (useExisting != null) {
+ flag = "true".compareToIgnoreCase( useExisting ) == 0;
+ }
- Topic mrc = mr_topicService.addTopic(topic, check.getErr());
+ Topic mrc = mr_topicService.addTopic(topic, check.getErr(), flag);
if ( mrc != null && check.getErr().is2xx() ) {
return check.success(Status.CREATED.getStatusCode(), mrc);
}
TopicService svc = new TopicService();
try {
@SuppressWarnings("unused")
- Topic nTopic = svc.addTopic(mmaTopic, err);
+ Topic nTopic = svc.addTopic(mmaTopic, err, true);
if ( err.is2xx() || err.getCode() == 409 ) {
return false;
}
return t;
}
- public Topic addTopic( Topic topic, ApiError err ) {
+ public Topic addTopic( Topic topic, ApiError err, Boolean useExisting ) {
logger.info( "Entry: addTopic");
logger.info( "Topic name=" + topic.getTopicName() + " fqtnStyle=" + topic.getFqtnStyle() );
String nFqtn = topic.genFqtn();
logger.info( "FQTN=" + nFqtn );
- if ( getTopic( nFqtn, err ) != null ) {
+ Topic pTopic = getTopic( nFqtn, err );
+ if ( pTopic != null ) {
String t = "topic already exists: " + nFqtn;
logger.info( t );
+ if ( useExisting ) {
+ err.setCode(Status.OK.getStatusCode());
+ return pTopic;
+ }
err.setMessage( t );
err.setFields( "fqtn");
err.setCode(Status.CONFLICT.getStatusCode());
TopicService ts = new TopicService();
ApiError err = new ApiError();
- ts.addTopic(bridgeAdminTopic, err);
+ ts.addTopic(bridgeAdminTopic, err, true);
if ( err.is2xx() || err.getCode() == 409 ){
err.setCode(200);
public void test3() {
Topic topic = factory.genSimpleTopic( "test3" );
ApiError err = new ApiError();
- Topic nTopic = ts.addTopic( topic, err );
+ Topic nTopic = ts.addTopic( topic, err, false );
if ( nTopic != null ) {
assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
}
public void test5() {
Topic topic = factory.genSimpleTopic( "test5" );
ApiError err = new ApiError();
- Topic nTopic = ts.addTopic( topic, err );
+ Topic nTopic = ts.addTopic( topic, err, false );
if ( nTopic != null ) {
assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
}
topic.setTopicName( "test3" );
topic.setFqtnStyle( FqtnType.Validator("none") );
topic.getFqtn();
- Topic nTopic = ts.addTopic( topic, err );
+ Topic nTopic = ts.addTopic( topic, err, false );
if ( nTopic != null ) {
assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
}
ts.reviewTopic( topic );
ts.checkForBridge( topic, err );
- Topic nTopic = ts.addTopic( topic, err );
+ Topic nTopic = ts.addTopic( topic, err, false );
if ( nTopic != null ) {
assertTrue( nTopic.getTopicName().equals( topic.getTopicName() ));
}
major=1
minor=0
-patch=17
+patch=18
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins