diff options
Diffstat (limited to 'src')
8 files changed, 76 insertions, 25 deletions
diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml index ee626bb..9fe7b77 100644 --- a/src/main/config/ajsc-jetty.xml +++ b/src/main/config/ajsc-jetty.xml @@ -32,7 +32,7 @@ <Set name="descriptor"><SystemProperty name="AJSC_HOME" />/etc/runner-web.xml</Set> <Set name="overrideDescriptor"><SystemProperty name="AJSC_HOME" />/etc/ajsc-override-web.xml</Set> <Set name="throwUnavailableOnStartupException">true</Set> - <Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar,<SystemProperty name="AJSC_HOME" />/extJars/mail-1.4.jar</Set> + <Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar,<SystemProperty name="AJSC_HOME" />/extJars/mail-1.4.4.jar</Set> <Set name="servletHandler"> <New class="org.eclipse.jetty.servlet.ServletHandler"> <Set name="startWithUnavailable">false</Set> diff --git a/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java b/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java index 389fb5c..4e2745b 100644 --- a/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java +++ b/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java @@ -3,6 +3,8 @@ * org.onap.dmaap * ================================================================================ * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,7 +86,6 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx */ @Override public Response toResponse(WebApplicationException ex) { - //System.out.println("--------------------------------------------------"+ex); LOGGER.info("Reached WebException Mapper"); /** @@ -126,11 +127,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx errRes = new ErrorResponse(errCode,dmaapErrCode,errMsg); LOGGER.info(errRes.toString()); - Response response = Response.status(errRes.getHttpStatusCode()).header("exception", + return Response.status(errRes.getHttpStatusCode()).header("exception", errRes.getErrMapperStr()).build(); - - return response; - } /** * UnAuthorized @@ -141,10 +139,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx getResponseCode(),msgs.getAuthFailure()); LOGGER.info(errRes.toString()); - Response response = Response.status(errRes.getHttpStatusCode()).header("exception", + return Response.status(errRes.getHttpStatusCode()).header("exception", errRes.getErrMapperStr()).build(); - - return response; } /** * Malformed request @@ -155,10 +151,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx getResponseCode(),msgs.getBadRequest()); LOGGER.info(errRes.toString()); - Response response = Response.status(errRes.getHttpStatusCode()).header("exception", + return Response.status(errRes.getHttpStatusCode()).header("exception", errRes.getErrMapperStr()).build(); - - return response; } /** * HTTP Method not allowed @@ -169,10 +163,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx getResponseCode(),msgs.getMethodNotAllowed()); LOGGER.info(errRes.toString()); - Response response = Response.status(errRes.getHttpStatusCode()).header("exception", + return Response.status(errRes.getHttpStatusCode()).header("exception", errRes.getErrMapperStr()).build(); - - return response; } /** @@ -184,10 +176,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx getResponseCode(),msgs.getServerUnav()); LOGGER.info(errRes.toString()); - Response response = Response.status(errRes.getHttpStatusCode()).header("exception", + return Response.status(errRes.getHttpStatusCode()).header("exception", errRes.getErrMapperStr()).build(); - - return response; } diff --git a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java index 49eddd9..71a0f63 100644 --- a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java +++ b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java @@ -68,7 +68,7 @@ public class ApiKeysRestService { /** * Logger obj */ - //private Logger log = Logger.getLogger(ApiKeysRestService.class.toString()); + private static final EELFLogger log = EELFManager.getInstance().getLogger(ApiKeysRestService.class); /** * HttpServletRequest obj diff --git a/src/main/java/org/onap/dmaap/service/EventsRestService.java b/src/main/java/org/onap/dmaap/service/EventsRestService.java index 2672261..d3abd6b 100644 --- a/src/main/java/org/onap/dmaap/service/EventsRestService.java +++ b/src/main/java/org/onap/dmaap/service/EventsRestService.java @@ -21,6 +21,7 @@ *******************************************************************************/ package org.onap.dmaap.service; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Date; @@ -96,6 +97,7 @@ public class EventsRestService { @Autowired private DMaaPErrorMessages errorMessages; + /** * This method is used to consume messages.Taking three parameter @@ -254,7 +256,7 @@ public class EventsRestService { public void pushEvents(@PathParam("topic") String topic, InputStream msg, @QueryParam("partitionKey") String partitionKey) throws CambriaApiException { log.info("Publishing message to topic " + topic); - + try { eventsService.pushEvents(getDmaapContext(), topic, msg, partitionKey, null); } @@ -313,8 +315,10 @@ public class EventsRestService { @QueryParam("partitionKey") String partitionKey) throws CambriaApiException { // log.info("Publishing message with transaction id for topic " + topic // ); + try { + eventsService.pushEvents(getDmaapContext(), topic, request.getInputStream(), partitionKey, Utils.getFormattedDate(new Date())); @@ -374,5 +378,6 @@ public class EventsRestService { return dmaapContext; } + }
\ No newline at end of file diff --git a/src/main/java/org/onap/dmaap/service/MetricsRestService.java b/src/main/java/org/onap/dmaap/service/MetricsRestService.java index 0a9193b..fdc67d5 100644 --- a/src/main/java/org/onap/dmaap/service/MetricsRestService.java +++ b/src/main/java/org/onap/dmaap/service/MetricsRestService.java @@ -58,7 +58,7 @@ public class MetricsRestService { /** * Logger obj */ - //private Logger log = Logger.getLogger(MetricsRestService.class.toString()); + private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class); /** * HttpServletRequest obj diff --git a/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java b/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java index b03eb5b..903fa96 100644 --- a/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java +++ b/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java @@ -43,7 +43,7 @@ public class ContentLengthInterceptor implements AjscInterceptor{ private String defLength; - //private Logger log = Logger.getLogger(ContentLengthInterceptor.class.toString()); + private static final EELFLogger log = EELFManager.getInstance().getLogger(ContentLengthInterceptor.class); @@ -87,7 +87,7 @@ public class ContentLengthInterceptor implements AjscInterceptor{ } else { - //chain.doFilter(req, res); + return true; } diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml index 9540437..ea8c596 100644 --- a/src/main/resources/docker-compose/docker-compose.yml +++ b/src/main/resources/docker-compose/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: zookeeper: - image: wurstmeister/zookeeper + image: nexus3.onap.org:10001/onap/dmaap/zookeeper:1.0.0 ports: - "2181:2181" @@ -34,7 +34,7 @@ services: - zookeeper dmaap: - image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.7 + image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.9 ports: - "3904:3904" - "3905:3905" diff --git a/src/test/java/org/onap/dmaap/mmagent/UpdateMirrorMakerTest.java b/src/test/java/org/onap/dmaap/mmagent/UpdateMirrorMakerTest.java index 1826026..6fceff1 100644 --- a/src/test/java/org/onap/dmaap/mmagent/UpdateMirrorMakerTest.java +++ b/src/test/java/org/onap/dmaap/mmagent/UpdateMirrorMakerTest.java @@ -22,14 +22,43 @@ import static org.junit.Assert.*; +import org.json.JSONObject; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.modules.junit4.PowerMockRunner; +@RunWith(PowerMockRunner.class) public class UpdateMirrorMakerTest { + @Rule + public ExpectedException exceptionRule = ExpectedException.none(); + + MirrorMaker mirrorMaker; + UpdateMirrorMaker updateMirrorMaker; + JSONObject jsonObject; + @Before public void setUp() throws Exception { + mirrorMaker = new MirrorMaker(); + updateMirrorMaker = new UpdateMirrorMaker(); + jsonObject = PowerMockito.mock(JSONObject.class); + + mirrorMaker.setConsumer("test"); + PowerMockito.when(jsonObject.has("consumer")).thenReturn(true); + + mirrorMaker.setProducer("test"); + PowerMockito.when(jsonObject.has("producer")).thenReturn(true); + + mirrorMaker.setNumStreams(1); + PowerMockito.when(jsonObject.has("numStreams")).thenReturn(true); + + PowerMockito.when(jsonObject.has("whitelist")).thenReturn(true); } @After @@ -77,5 +106,32 @@ public class UpdateMirrorMakerTest { } + @Test(expected = CambriaApiException.class) + public void testValidateJSONNullConsumer() throws CambriaApiException { + mirrorMaker.setConsumer(null); + updateMirrorMaker.setUpdateMirrorMaker(mirrorMaker); + updateMirrorMaker.validateJSON(jsonObject); + } + @Test(expected = CambriaApiException.class) + public void testValidateJSONNullProducer() throws CambriaApiException { + mirrorMaker.setProducer(null); + updateMirrorMaker.setUpdateMirrorMaker(mirrorMaker); + updateMirrorMaker.validateJSON(jsonObject); + } + + @Test(expected = CambriaApiException.class) + public void testValidateJSONNoNumStreams() throws CambriaApiException { + mirrorMaker.setNumStreams(0); + updateMirrorMaker.setUpdateMirrorMaker(mirrorMaker); + updateMirrorMaker.validateJSON(jsonObject); + } + + @Test(expected = CambriaApiException.class) + public void testValidateJSONWhitelist() throws CambriaApiException { + PowerMockito.when(jsonObject.has("whitelist")).thenReturn(true); + + updateMirrorMaker.setUpdateMirrorMaker(mirrorMaker); + updateMirrorMaker.validateJSON(jsonObject); + } }
\ No newline at end of file |