Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix object references to show fields
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
resources
/
TopicResource.java
diff --git
a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
index
cab48ca
..
5f027aa
100644
(file)
--- a/
src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/
src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
@@
-35,6
+35,7
@@
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
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;
import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@
-42,7
+43,6
@@
import javax.ws.rs.core.Response.Status;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.model.ApiError;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.model.ApiError;
-import org.onap.dmaap.dbcapi.model.DR_Pub;
import org.onap.dmaap.dbcapi.model.ReplicationType;
import org.onap.dmaap.dbcapi.model.FqtnType;
import org.onap.dmaap.dbcapi.model.Topic;
import org.onap.dmaap.dbcapi.model.ReplicationType;
import org.onap.dmaap.dbcapi.model.FqtnType;
import org.onap.dmaap.dbcapi.model.Topic;
@@
-57,11
+57,16
@@
import org.onap.dmaap.dbcapi.util.DmaapConfig;
@Authorization
public class TopicResource extends BaseLoggingClass {
private static FqtnType defaultTopicStyle;
@Authorization
public class TopicResource extends BaseLoggingClass {
private static FqtnType defaultTopicStyle;
+ private static String defaultPartitionCount;
+ private static String defaultReplicationCount;
TopicService mr_topicService = new TopicService();
public TopicResource() {
DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
TopicService mr_topicService = new TopicService();
public TopicResource() {
DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
- defaultTopicStyle = FqtnType.Validator( p.getProperty("MR.topicStyle", "FQTN_LEGACY_FORMAT"));
+ defaultTopicStyle = FqtnType.Validator( p.getProperty("MR.topicStyle", "FQTN_LEGACY_FORMAT"));
+ defaultPartitionCount = p.getProperty( "MR.partitionCount", "2");
+ defaultReplicationCount = p.getProperty( "MR.replicationCount", "1");
+
logger.info( "Setting defaultTopicStyle=" + defaultTopicStyle );
}
logger.info( "Setting defaultTopicStyle=" + defaultTopicStyle );
}
@@
-70,7
+75,7
@@
public class TopicResource extends BaseLoggingClass {
notes = "Returns array of `Topic` objects.",
response = Topic.class)
@ApiResponses( value = {
notes = "Returns array of `Topic` objects.",
response = Topic.class)
@ApiResponses( value = {
- @ApiResponse( code = 200, message = "Success", response =
DR_Pub
.class),
+ @ApiResponse( code = 200, message = "Success", response =
Topic
.class),
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response getTopics() {
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response getTopics() {
@@
-90,13
+95,14
@@
public class TopicResource extends BaseLoggingClass {
notes = "Create `Topic` object.",
response = Topic.class)
@ApiResponses( value = {
notes = "Create `Topic` object.",
response = Topic.class)
@ApiResponses( value = {
- @ApiResponse( code = 200, message = "Success", response =
DR_Pub
.class),
+ @ApiResponse( code = 200, message = "Success", response =
Topic
.class),
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response addTopic(
@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 {
ApiService check = new ApiService();
try {
@@
-117,9
+123,21
@@
public class TopicResource extends BaseLoggingClass {
logger.info( "setting defaultTopicStyle=" + defaultTopicStyle + " for topic " + topic.getTopicName() );
topic.setFqtnStyle( defaultTopicStyle );
}
logger.info( "setting defaultTopicStyle=" + defaultTopicStyle + " for topic " + topic.getTopicName() );
topic.setFqtnStyle( defaultTopicStyle );
}
+ String pc = topic.getPartitionCount();
+ if ( pc == null ) {
+ topic.setPartitionCount(defaultPartitionCount);
+ }
+ String rc = topic.getReplicationCount();
+ if ( rc == null ) {
+ topic.setReplicationCount(defaultReplicationCount);
+ }
topic.setLastMod();
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);
}
if ( mrc != null && check.getErr().is2xx() ) {
return check.success(Status.CREATED.getStatusCode(), mrc);
}
@@
-131,7
+149,7
@@
public class TopicResource extends BaseLoggingClass {
notes = "Update a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
notes = "Update a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
- @ApiResponse( code = 200, message = "Success", response =
DR_Pub
.class),
+ @ApiResponse( code = 200, message = "Success", response =
Topic
.class),
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")
@@
-151,7
+169,7
@@
public class TopicResource extends BaseLoggingClass {
notes = "Delete a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
notes = "Delete a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
- @ApiResponse( code = 204, message = "Success", response =
DR_Pub
.class),
+ @ApiResponse( code = 204, message = "Success", response =
Topic
.class),
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")
@@
-180,7
+198,7
@@
public class TopicResource extends BaseLoggingClass {
notes = "Retrieve a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
notes = "Retrieve a `Topic` object, identified by topicId",
response = Topic.class)
@ApiResponses( value = {
- @ApiResponse( code = 200, message = "Success", response =
DR_Pub
.class),
+ @ApiResponse( code = 200, message = "Success", response =
Topic
.class),
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
@Path("/{topicId}")