Merge changes Ib64aef9e,I9ddca4c9,I6f3d70c9,I4db44c12,Ie267b119, ...
* changes:
sonar majorissue for ServicePropertyService.java
sonar minor issue for MMRestService.java
sonar minor issue for MMRestService.java
sonarcritical issue for ConfigTool.java
sonar minor issue for MMRestService.java
sonar minor issue for TopicRestService.java
sonar minor issue for TopicRestService.java
sonar issue for ConfigTool.java
sonar issue for ConfigTool.java
sonar issue for ConfigTool.java
sonar issue for ConfigTool.java
diff --git a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
index 9f9c862..a6a77ba 100644
--- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
+++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java
@@ -35,9 +35,6 @@
import com.att.eelf.configuration.EELFManager;
-//import com.att.ssf.filemonitor.FileChangedListener;
-//import com.att.ssf.filemonitor.FileMonitor;
-
/**
* ServicePropertyService class
* @author author
diff --git a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
index 2d4a75b..e816da5 100644
--- a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
@@ -224,7 +224,7 @@
@POST
@Produces("application/json")
@Path("/listall")
- public void callListAllMirrorMaker(InputStream msg) throws CambriaApiException {
+ public void callListAllMirrorMaker(InputStream msg) {
DMaaPContext ctx = getDmaapContext();
if (checkMirrorMakerPermission(ctx,
@@ -288,7 +288,7 @@
@POST
@Produces("application/json")
@Path("/update")
- public void callUpdateMirrorMaker(InputStream msg) throws CambriaApiException {
+ public void callUpdateMirrorMaker(InputStream msg) {
DMaaPContext ctx = getDmaapContext();
if (checkMirrorMakerPermission(ctx,
@@ -374,7 +374,7 @@
@POST
@Produces("application/json")
@Path("/delete")
- public void callDeleteMirrorMaker(InputStream msg) throws CambriaApiException {
+ public void callDeleteMirrorMaker(InputStream msg) {
DMaaPContext ctx = getDmaapContext();
if (checkMirrorMakerPermission(ctx,
diff --git a/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java b/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
index 50bd069..d8be745 100644
--- a/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
@@ -299,7 +299,7 @@
@Path("/create")
@Consumes({ MediaType.APPLICATION_JSON })
// @Produces(MediaType.TEXT_PLAIN)
- public void createTopic(TopicBean topicBean) throws CambriaApiException, JSONException {
+ public void createTopic(TopicBean topicBean) throws CambriaApiException{
try {
LOGGER.info("Creating Topic." + topicBean.getTopicName());
@@ -524,7 +524,7 @@
@Path("/{topicName}/consumers")
// @Produces(MediaType.TEXT_PLAIN)
public void getConsumersByTopicName(@PathParam("topicName") String topicName)
- throws AccessDeniedException, CambriaApiException {
+ throws CambriaApiException {
try {
// String permission =
diff --git a/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java b/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
index 19f22d0..9f55249 100644
--- a/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
+++ b/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
@@ -205,7 +205,7 @@
}
catch ( ConfigDbException e )
{
- out.println ( "Command failed: " + e.getMessage() );
+ out.println ( "Command failed: " + e);
}
}
@@ -241,7 +241,7 @@
}
catch ( ConfigDbException e )
{
- out.println ( "Command failed: " + e.getMessage () );
+ out.println ( "Command failed: " + e);
}
}
@@ -287,7 +287,7 @@
}
catch ( ConfigDbException e )
{
- out.println ( "Command failed: " + e.getMessage () );
+ out.println ( "Command failed: " + e);
}
}
@@ -349,11 +349,11 @@
}
catch ( ConfigDbException e )
{
- out.println ( "Command failed: " + e.getMessage() );
+ out.println ( "Command failed: " + e);
}
catch ( JSONException e )
{
- out.println ( "Command failed: " + e.getMessage() );
+ out.println ( "Command failed: " + e);
}
}