<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
return(true);
} catch (Exception e) {
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_ERROR, pURL, e.getMessage() );
- e.printStackTrace();
return(false);
}
logger.info( "artificial 200 response from doPostFeed because unit_test =" + unit_test );
} else {
logger.warn("Unable to read response " );
- e.printStackTrace();
+ errorLogger.error("Unable to read response ", e.getMessage());
try {
err.setCode( uc.getResponseCode());
err.setMessage(uc.getResponseMessage());
finally {
try {
uc.disconnect();
- } catch ( Exception e ) {}
+ } catch ( Exception e ) {
+ logger.error(e.getMessage(), e);
+ }
}
return responseBody;
logger.info( "artificial 200 response from doXgressPost because unit_test =" + unit_test );
} else {
logger.error("Unable to read response " );
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
}
}
finally {
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
rc = uc.getResponseCode();
err.setMessage( "simulated response");
logger.info( "artificial 200 response from doPostDr_Sub because unit_test =" + unit_test );
} else {
- System.err.println("Unable to read response " );
- e.printStackTrace();
+ logger.error("Unable to read response ", e.getMessage());
}
}
finally {
try {
uc.disconnect();
- } catch ( Exception e ) {}
+ } catch ( Exception e ) {
+ logger.error(e.getMessage(), e);
+ }
}
return responseBody;
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
rc = uc.getResponseCode();
logger.info( "artificial 200 response from doPutFeed because unit_test =" + unit_test );
} else {
logger.warn("Unable to read response " );
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
}
try {
err.setCode( uc.getResponseCode());
} catch (Exception e2) {
err.setCode( 500 );
err.setMessage("Unable to determine response message");
+ logger.error(e2.getMessage(), e2);
}
} finally {
try {
uc.disconnect();
- } catch ( Exception e ) {}
+ } catch ( Exception e ) {
+ logger.error(e.getMessage(), e);
+ }
}
return responseBody;
}
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
rc = uc.getResponseCode();
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
err.setCode( 500 );
err.setMessage("Backend connection refused");
+ logger.error(ce.getMessage(), ce);
} catch (Exception e) {
if ( unit_test.equals( "Yes" ) ) {
err.setCode(200);
logger.error(e.getMessage(), e);
}
} finally {
- uc.disconnect();
+ if(null != uc){
+ uc.disconnect();
+ }
}
return responseBody;
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
err.setCode( 500 );
err.setMessage("Backend connection refused");
+ logger.error(ce.getMessage(), ce);
} catch (Exception e) {
if ( unit_test.equals( "Yes" ) ) {
err.setCode(200);
err.setMessage( "simulated response");
logger.info( "artificial 200 response from doGetNodes because unit_test =" + unit_test );
} else {
- System.err.println("Unable to read response " );
- e.printStackTrace();
+ logger.error("Unable to read response ", e.getMessage());
}
} finally {
err.setMessage( "simulated response");
logger.info( "artificial 200 response from doPutNodes because unit_test =" + unit_test );
} else {
- System.err.println("Unable to read response " + e.getMessage() );
- e.printStackTrace();
+ logger.error("Unable to read response ", e.getMessage());
}
} finally {
if ( uc != null ) {
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
rc = uc.getResponseCode();
errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, ce.getMessage() );
err.setCode( 500 );
err.setMessage("Backend connection refused");
+ logger.error(ce.getMessage(), ce);
} catch (SocketException se) {
errorLogger.error( DmaapbcLogMessageEnum.SOCKET_EXCEPTION, se.getMessage(), "response from Prov server" );
err.setCode( 500 );
err.setMessage( "Unable to read response from DR");
+ logger.error(se.getMessage(), se);
} catch (Exception e) {
if ( unit_test.equals( "Yes" ) ) {
err.setCode(200);
logger.info( "artificial 200 response from doDeleteFeed because unit_test =" + unit_test );
} else {
logger.warn("Unable to read response " );
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
try {
err.setCode( uc.getResponseCode());
err.setMessage(uc.getResponseMessage());
} catch (Exception e2) {
err.setCode( 500 );
err.setMessage("Unable to determine response message");
+ logger.error(e2.getMessage(), e2);
}
}
} finally {
try {
- uc.disconnect();
- } catch ( Exception e ) {}
+ if(uc != null) {
+ uc.disconnect();
+ }
+ } catch ( Exception e ) {
+ logger.error(e.getMessage(), e);
+ }
}
return responseBody;
}
// without this, Java will connect multiple times to the server to run the same request
uc.setDoOutput(false);
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
}
}
rc = uc.getResponseCode();
err.setMessage( "simulated response");
logger.info( "artificial 200 response from doDeleteDr_Sub because unit_test =" + unit_test );
} else {
- System.err.println("Unable to read response " );
- e.printStackTrace();
+ logger.error("Unable to read response ", e.getMessage());
}
} finally {
- uc.disconnect();
+ if(uc != null){
+ uc.disconnect();
+ }
}
return responseBody;
private boolean guaranteedDelivery;
private boolean guaranteedSequence;
private boolean privilegedSubscriber;
-
+ private boolean decompressData;
+
// NOTE: the following fields are optional in the API but not stored in the DB
+
private String feedName;
private String feedVersion;
-
public DR_Sub() {
}
-
+
public DR_Sub( String dLN,
String uN,
String uP,
this.setStatus( DmaapObject_Status.NEW );
this.subId = "0";
}
-
+
public DR_Sub ( String json ) {
logger.info( "DR_Sub:" + json );
JSONParser parser = new JSONParser();
JSONObject jsonObj;
-
+
try {
jsonObj = (JSONObject) parser.parse( json );
} catch ( ParseException pe ) {
this.setOwner( (String) jsonObj.get("subscriber"));
this.setSuspended( (boolean) jsonObj.get("suspend"));
-
+
try {
JSONObject links = (JSONObject) jsonObj.get("links");
String url = (String) links.get("feed");
logger.info( "feedid="+ this.getFeedId() );
this.setLogURL( (String) links.get("log") );
} catch (NullPointerException npe ) {
-
+
}
try {
this.setGuaranteedDelivery( (boolean) jsonObj.get("guaranteed_delivery"));
} catch( NullPointerException npe ) {
this.setPrivilegedSubscriber(false);
}
-
+ try {
+ this.setDecompressData((boolean) jsonObj.get("decompressData"));
+ } catch( NullPointerException npe ) {
+ this.setDecompressData(false);
+ }
+
JSONObject del = (JSONObject) jsonObj.get("delivery");
- this.setDeliveryURL( (String) del.get("url") );
+ this.setDeliveryURL( (String) del.get("url") );
this.setUsername( (String) del.get("user"));
this.setUserpwd( (String) del.get( "password"));
this.setUse100((boolean) del.get( "use100"));
-
-
this.setStatus( DmaapObject_Status.VALID );
logger.info( "new DR_Sub returning");
}
-
+
public String getOwner() {
return owner;
}
public void setPrivilegedSubscriber(boolean privilegedSubscriber) {
this.privilegedSubscriber = privilegedSubscriber;
}
-
-
+
+ public boolean isDecompressData() {
+ return decompressData;
+ }
+
+ public void setDecompressData(boolean decompressData) {
+ this.decompressData = decompressData;
+ }
public String getFeedName() {
return feedName;
return toProvJSON().getBytes(StandardCharsets.UTF_8);
}
// returns the DR_Sub object in JSON that conforms to ONAP DR Prov Server expectations
- public String toProvJSON() {
+ public String toProvJSON() {
// this is the original DR API that was contributed to ONAP
String postJSON = String.format("{\"suspend\": %s, \"delivery\":"
+ "{\"url\": \"%s\", \"user\": \"%s\", \"password\": \"%s\", \"use100\": %s }"
+ ", \"metadataOnly\": %s, \"groupid\": \"%s\", \"follow_redirect\": %s "
- + ", \"privilegedSubscriber\": %s "
+ + ", \"privilegedSubscriber\": %s, \"decompress\": %s "
+ "}"
,this.suspended
,this.getDeliveryURL()
,this.getUsername()
,this.getUserpwd()
- ,this.isUse100()
+ ,this.isUse100()
,"false"
,"0"
,"true"
,this.isPrivilegedSubscriber()
- );
-
+ ,this.isDecompressData()
+ );
+
logger.info( postJSON );
return postJSON;
}
// returns the DR_Sub object in JSON that conforms to AT&T DR Prov Server expectations
// In Jan, 2019, the DR API used internally at AT&T diverged, so this function can be used in
// that runtime environment
- public String toProvJSONforATT() {
+ public String toProvJSONforATT() {
// in DR 3.0, API v2.1 a new groupid field is added. We are not using this required field so just set it to 0.
// we send this regardless of DR Release because older versions of DR seem to safely ignore it
// and soon those versions won't be around anyway...
,"true"
,this.isGuaranteedDelivery()
,this.isGuaranteedSequence()
- );
-
+ );
+
logger.info( postJSON );
return postJSON;
}
-
+
@Override
public String toString() {
String rc = String.format ( "DR_Sub: {dcaeLocationName=%s username=%s userpwd=%s feedId=%s deliveryURL=%s logURL=%s subid=%s use100=%s suspended=%s owner=%s}",
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@alter table dr_sub
- add column guaranteed_delivery boolean,
- add column guaranteed_sequence boolean,
- add column privileged_subscriber boolean
+ add column guaranteed_delivery boolean,
+ add column guaranteed_sequence boolean,
+ add column privileged_subscriber boolean,
+ add column decompress_data boolean
;
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dmaap
+ * ================================================================================
+ * Copyright 2019 IBM
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dmaap.dbcapi.aaf;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class AafRoleTest {
+
+ AafRole aafRole;
+
+ @Before
+ public void setUp() {
+ aafRole = new AafRole("testNs", "testRole");
+ }
+
+ @Test
+ public void testAafRole() {
+ aafRole.setNamespace("namespace");
+ aafRole.setRole("role");
+ assertEquals("namespace", aafRole.getNamespace());
+ assertEquals("role", aafRole.getRole());
+ assertEquals("namespace.role", aafRole.getFullyQualifiedRole());
+ assertNotNull(aafRole.toJSON());
+ }
+}
* ================================================================================
* Copyright (C) 2019 IBM 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.
* You may obtain a copy of the License at
package org.onap.dmaap.dbcapi.aaf;
-import org.junit.Test;
-
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
public class AafUserRoleTest {
+ AafUserRole aafUserRole;
+
+ @Before
+ public void setUp() {
+ aafUserRole = new AafUserRole("xyz", "admin");
+ }
+
+ @Test
+ public void testGetIdentity() {
+ aafUserRole.setIdentity("xyz");
+ assertEquals("xyz", aafUserRole.getIdentity());
+ }
+
+ @Test
+ public void testGetRole() {
+ aafUserRole.setRole("admin");
+ assertEquals("admin", aafUserRole.getRole());
+ }
+
@Test
public void toJSON() {
- AafUserRole role = new AafUserRole("test","admin");
+ AafUserRole role = new AafUserRole("test", "admin");
assertThat(role.toJSON(), is(" { \"user\": \"test\", \"role\": \"admin\" }"));
}
}
\ No newline at end of file
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dmaap
+ * ================================================================================
+ * Copyright 2019 IBM
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dmaap.dbcapi.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class BrTopicTest {
+
+ BrTopic brTopic;
+
+ @Before
+ public void setUp() {
+ brTopic = new BrTopic();
+ }
+
+ @Test
+ public void testGetBrSource() {
+ brTopic.setBrSource("brSource");
+ assertEquals("brSource", brTopic.getBrSource());
+ }
+
+ @Test
+ public void testGetBrTarget() {
+ brTopic.setBrTarget("brTarget");
+ assertEquals("brTarget", brTopic.getBrTarget());
+ }
+
+ @Test
+ public void testGetTopicCount() {
+ brTopic.setTopicCount(1);
+ assertEquals(1, brTopic.getTopicCount());
+ }
+
+ @Test
+ public void testGetMmAgentName() {
+ brTopic.setMmAgentName("Test");
+ assertEquals("Test", brTopic.getMmAgentName());
+ }
+}
assertTrue( t.isGuaranteedDelivery() == false );
assertTrue( t.isGuaranteedSequence() == false );
assertTrue( t.isPrivilegedSubscriber() == false );
-
+ assertTrue( t.isDecompressData() == false );
}
@Test
assertTrue( t.isGuaranteedSequence() == v );
t.setPrivilegedSubscriber(v);
assertTrue( t.isPrivilegedSubscriber() == v );
+ t.setDecompressData(v);
+ assertTrue( t.isDecompressData() == v );
}
@Test
* ================================================================================
* Copyright (C) 2018 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.
* You may obtain a copy of the License at
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dmaap.dbcapi.model;
import static org.junit.Assert.*;
import org.junit.Test;
import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
-
public class MRClientTest {
- private static final String fmt = "%24s: %s%n";
-
- ReflectionHarness rh = new ReflectionHarness();
-
- String d, t, f, c, m;
-
- @Before
- public void setUp() throws Exception {
- d = "central-onap";
- t = "org.onap.dmaap.interestingTopic";
- f = "mrc.onap.org:3904/events/org.onap.dmaap.interestingTopic";
- c = "publisher";
- m = "m12345";
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
-
- @Test
- public void test1() {
-
- // can't use simple reflection to test for null since null constructor initializes some fields.
- //rh.reflect( "org.onap.dmaap.dbcapi.model.MR_Client", "get", null );
- // so brute force instead...
- String[] a = { "put", "view" };
- MR_Client m = new MR_Client();
-
-
- assertTrue( null == m.getDcaeLocationName() );
- assertTrue( null == m.getFqtn() );
- assertTrue( null == m.getClientRole() );
- assertTrue( null == m.getAction() );
-
- }
-
- @Test
- public void test2() {
- String[] a = { "put", "view" };
- MR_Client m = new MR_Client( d, f, c, a );
-
-
- assertTrue( d.equals( m.getDcaeLocationName() ));
- assertTrue( f.equals( m.getFqtn() ));
- assertTrue( c.equals( m.getClientRole() ));
- String[] ma = m.getAction();
- assertTrue( a.length == ma.length );
- for( int i = 0; i < a.length; i++ ) {
- assertTrue( a[i].equals( ma[i] ) );
- }
- }
-
- @Test
- public void test3() {
-
- String v = "Validate";
- rh.reflect( "org.onap.dmaap.dbcapi.model.MR_Client", "set", v );
- }
+ private static final String fmt = "%24s: %s%n";
+
+ ReflectionHarness rh = new ReflectionHarness();
+
+ String d, t, f, c, m;
+
+ @Before
+ public void setUp() throws Exception {
+ d = "central-onap";
+ t = "org.onap.dmaap.interestingTopic";
+ f = "mrc.onap.org:3904/events/org.onap.dmaap.interestingTopic";
+ c = "publisher";
+ m = "m12345";
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void test1() {
+
+ // can't use simple reflection to test for null since null constructor
+ // initializes some fields.
+ // rh.reflect( "org.onap.dmaap.dbcapi.model.MR_Client", "get", null );
+ // so brute force instead...
+ String[] a = { "put", "view" };
+ MR_Client m = new MR_Client();
+
+ assertTrue(null == m.getDcaeLocationName());
+ assertTrue(null == m.getFqtn());
+ assertTrue(null == m.getClientRole());
+ assertTrue(null == m.getAction());
+
+ }
+
+ @Test
+ public void test2() {
+ String[] a = { "put", "view" };
+ MR_Client m = new MR_Client(d, f, c, a);
+
+ assertTrue(d.equals(m.getDcaeLocationName()));
+ assertTrue(f.equals(m.getFqtn()));
+ assertTrue(c.equals(m.getClientRole()));
+ String[] ma = m.getAction();
+ assertTrue(a.length == ma.length);
+ for (int i = 0; i < a.length; i++) {
+ assertTrue(a[i].equals(ma[i]));
+ }
+ }
+
+ @Test
+ public void test3() {
+
+ String v = "Validate";
+ rh.reflect("org.onap.dmaap.dbcapi.model.MR_Client", "set", v);
+ }
+
+ @Test
+ public void test4() {
+ MR_Client mrClient = new MR_Client();
+ String stringArray[] = { "test" };
+ mrClient.setAction(stringArray);
+ mrClient.hasAction("");
+ mrClient.setMrClientId("mrClientId");
+ mrClient.setTopicURL("testTopicURL");
+ mrClient.setClientIdentity("clientIdentity");
+
+ assertEquals("clientIdentity", mrClient.getClientIdentity());
+ assertEquals("testTopicURL", mrClient.getTopicURL());
+ assertEquals("mrClientId", mrClient.getMrClientId());
+ assertEquals(false, mrClient.isPublisher());
+ assertEquals(false, mrClient.isSubscriber());
+ assertEquals("test", mrClient.getAction()[0]);
+
+ }
}
Code Review / dmaap / dbcapi.git / commitdiff