Merge changes I17a289cd,Ie0d50a2c

* changes:
  revert topic exist  check while publishing
  revert topic exist topic check while publishing

diff --git a/pom.xml b/pom.xml
index 7b3e943..2428f29 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
        <artifactId>msgrtr</artifactId>
-       <version>1.1.18-SNAPSHOT</version>
+       <version>1.1.19-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
index 93c7f36..f67a507 100644 (file)
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
@@ -325,9 +325,7 @@ public class EventsServiceImpl implements EventsService {
                validateIpBlacklist(errRespProvider, ctx);
 
                final Topic metaTopic = ctx.getConfigReader().getfMetaBroker().getTopic(topic);
-               if (metaTopic == null) {
-                       throw new CambriaApiException(errRespProvider.getTopicNotFoundError());
-               }
+               
 
                final boolean isAAFTopic = authorizeClientWhenNeeded(ctx, metaTopic, topic, errRespProvider, PUBLISH_ACTION);
 

diff --git a/src/test/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImplTest.java b/src/test/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImplTest.java
index 4abbe89..f9178e1 100644 (file)
--- a/src/test/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImplTest.java
+++ b/src/test/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImplTest.java
@@ -402,16 +402,7 @@ public class EventsServiceImplTest {
     }
 
 
-    @Test
-    public void pushEvents_shouldFail_whenRequestedTopicDoesNotExist() throws Exception {
-        when(configurationReader.getfMetaBroker()).thenReturn(dmaapKafkaMetaBroker);
-        when(dmaapKafkaMetaBroker.getTopic("testTopic")).thenReturn(null);
-
-        thrown.expect(CambriaApiException.class);
-        thrown.expectMessage(containsString(String.valueOf(HttpStatus.SC_NOT_FOUND)));
-
-        eventsService.pushEvents(dMaapContext, "testTopic", iStream, "5", "13:00:00");
-    }
+  
 
     @Test
     public void pushEvents_shouldFailDmaapAuthorization_whenTopicOwnerIsSet_andUserHasNoWritePermissionToTopic()

diff --git a/version.properties b/version.properties
index dba8f85..9ac4233 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=18
+patch=19
 
 base_version=${major}.${minor}.${patch}