aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/dmaapbc.properties6
-rw-r--r--pom.xml6
-rw-r--r--src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java18
3 files changed, 23 insertions, 7 deletions
diff --git a/etc/dmaapbc.properties b/etc/dmaapbc.properties
index b2cbe1c..64e435e 100644
--- a/etc/dmaapbc.properties
+++ b/etc/dmaapbc.properties
@@ -118,16 +118,18 @@ MR.ClientDeleteLevel: 1
#
# MR Topic Factory Namespace
#
-MR.TopicFactoryNS: org.onap.dcae.dmaap.topicFactory
+MR.TopicFactoryNS: org.onap.dmaap.mr.topicFactory
#
# MR TopicMgr Role
-MR.TopicMgrRole: org.onap.dmaapBC.TopicMgr
+MR.TopicMgrRole: org.onap.dmaap-bc.TopicMgr
# MR topic name style
MR.topicStyle: FQTN_LEGACY_FORMAT
# MR topic ProjectID
MR.projectID: 23456
+
+MR.multisite: false
#
# end of MR Related Properties
################################################################################
diff --git a/pom.xml b/pom.xml
index ba32d24..32f2db3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,12 +244,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
</dependency>
<!-- DMAAP-656:
- override this dependency because it utilized a third party
@@ -322,7 +322,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.4.1208.jre7</version>
+ <version>42.2.5</version>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
diff --git a/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java
index 43cf523..b494a59 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/TopicResourceTest.java
@@ -31,6 +31,7 @@ import org.glassfish.jersey.test.JerseyTest;
import org.junit.Before;
import org.junit.Test;
import org.onap.dmaap.dbcapi.model.DcaeLocation;
+import org.onap.dmaap.dbcapi.model.Dmaap;
import org.onap.dmaap.dbcapi.model.MR_Cluster;
import org.onap.dmaap.dbcapi.model.Topic;
import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
@@ -46,7 +47,8 @@ public class TopicResourceTest extends JerseyTest {
return new ResourceConfig()
.register( TopicResource.class )
.register( MR_ClusterResource.class )
- .register( DcaeLocationResource.class );
+ .register( DcaeLocationResource.class )
+ .register( DmaapResource.class );
}
private static final String fmt = "%24s: %s%n";
@@ -57,6 +59,15 @@ public class TopicResourceTest extends JerseyTest {
@Before
public void preTest() throws Exception {
try {
+
+ Dmaap dmaap = factory.genDmaap();
+ Entity<Dmaap> reqEntity = Entity.entity( dmaap, MediaType.APPLICATION_JSON );
+ Response resp = target( "dmaap").request().post( reqEntity, Response.class );
+ System.out.println( resp.getStatus() );
+ assertTrue( resp.getStatus() == 200 );
+ }catch (Exception e ) {
+ }
+ try {
DcaeLocation loc = factory.genDcaeLocation( "central" );
Entity<DcaeLocation> reqEntity = Entity.entity( loc, MediaType.APPLICATION_JSON );
Response resp = target( "dcaeLocations").request().post( reqEntity, Response.class );
@@ -72,7 +83,7 @@ public class TopicResourceTest extends JerseyTest {
Response resp = target( "mr_clusters").request().post( reqEntity, Response.class );
System.out.println( "POST MR_Cluster resp=" + resp.getStatus() + " " + resp.readEntity( String.class ) );
if (resp.getStatus() != 409 ) {
- assertTrue( resp.getStatus() == 200);
+ assertTrue( resp.getStatus() == 201);
}
} catch (Exception e ) {
@@ -93,6 +104,8 @@ public class TopicResourceTest extends JerseyTest {
assertTrue( resp.getStatus() == 200 );
}
+
+
@Test
public void PostTest() {
Topic topic = factory.genSimpleTopic( "test1" );
@@ -110,6 +123,7 @@ public class TopicResourceTest extends JerseyTest {
}
+
@Test
public void PutTest() {