diff options
7 files changed, 18 insertions, 24 deletions
diff --git a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java index e5fe8c4..c3699c7 100644 --- a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java +++ b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java @@ -103,8 +103,8 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx /** * Cambria Generic Exception */ - if(ex instanceof CambriaApiException) - { + /*if(ex instanceof CambriaApiException) + {*/ errRes = ex.getErrRes(); if(errRes!=null) { @@ -124,7 +124,7 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx } - } + /*} else { errRes = new ErrorResponse(HttpStatus.SC_NOT_FOUND, @@ -134,7 +134,7 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx errRes.getErrMapperStr()).build(); return response; - } + }*/ } diff --git a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListener.java b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListener.java index 80ff8eb..edbdadf 100644 --- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListener.java +++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListener.java @@ -35,8 +35,8 @@ public class ServicePropertiesListener/* implements FileChangedListener*/ { * Update method */ //@Override - public void update(File file) throws Exception + /*public void update(File file) throws Exception { ServicePropertiesMap.refresh(file); - } + }*/ } diff --git a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java index 67b9e04..219a601 100644 --- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java +++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java @@ -21,16 +21,10 @@ *******************************************************************************/ package com.att.nsa.dmaap.filemonitor; -import java.io.File; -import java.io.FileInputStream; import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; /** * ServicePropertiesMap class @@ -50,7 +44,7 @@ public class ServicePropertiesMap * @param file file * @throws Exception ex */ - public static void refresh(File file) throws Exception + /*public static void refresh(File file) throws Exception { try { @@ -94,7 +88,7 @@ public class ServicePropertiesMap logger.error("File " + (file != null?file.getName():"") + " cannot be loaded into the map ", e); throw new Exception("Error reading map file " + (file != null?file.getName():""), e); } - } + }*/ /** * Get property * @param fileName fileName 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 d573d8b..55c1661 100644 --- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java +++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertyService.java @@ -63,7 +63,7 @@ public class ServicePropertyService { * @throws Exception ex */ @PostConstruct - public void init() throws Exception { + public void init() { try { getFileList(FILE_CHANGE_LISTENER_LOC); diff --git a/src/main/java/com/att/nsa/dmaap/mmagent/MirrorMaker.java b/src/main/java/com/att/nsa/dmaap/mmagent/MirrorMaker.java index cb19a00..e3f688e 100644 --- a/src/main/java/com/att/nsa/dmaap/mmagent/MirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaap/mmagent/MirrorMaker.java @@ -27,8 +27,8 @@ public class MirrorMaker { public String producer; public String whitelist; public String status; - public int numStreams =1; - public boolean enablelogCheck = false; + private int numStreams =1; + private boolean enablelogCheck = false; public String getStatus() { return status; diff --git a/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListenerTest.java b/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListenerTest.java index a40ccb6..210ecfd 100644 --- a/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListenerTest.java +++ b/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesListenerTest.java @@ -38,8 +38,8 @@ public class ServicePropertiesListenerTest { public void tearDown() throws Exception {
}
- @Test
- public void testUpdate() {
+ //@Test
+ public void testUpdate() {/*
ServicePropertiesListener listener = new ServicePropertiesListener();
@@ -52,6 +52,6 @@ public class ServicePropertiesListenerTest { assertTrue(true);
- }
+ */}
}
\ No newline at end of file diff --git a/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMapTest.java b/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMapTest.java index d4e9838..636f051 100644 --- a/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMapTest.java +++ b/src/test/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMapTest.java @@ -55,7 +55,7 @@ public class ServicePropertiesMapTest { public void tearDown() throws Exception {
}
- @Test
+ /*@Test
public void testRefresh() {
try {
@@ -80,12 +80,12 @@ public class ServicePropertiesMapTest { @Test
public void testRefreshPropsFile() throws Exception {
- /*Path resourceDirectory = Paths.get("src/test/resources");
- map.refresh(new File(resourceDirectory+"\\"+"test.properties"));*/
+ Path resourceDirectory = Paths.get("src/test/resources");
+ map.refresh(new File(resourceDirectory+"\\"+"test.properties"));
ClassLoader classLoader = getClass().getClassLoader();
map.refresh(new File(classLoader.getResource("test.json").getFile()));
assertTrue(true);
- }
+ }*/
@Test
public void testGetProperty() {
|