diff options
| author |   dglFromAtt <dgl@research.att.com> | 2019-04-10 18:48:26 -0400 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2019-04-10 19:05:58 -0400 |
| commit | 0654d98f69b80b8d932dd33a5dcc56dbecc6a64e (patch) | |
| tree | af0231a8b527f1c8f48eb44234047f0b3c234918 /src/main/java/org | |
| parent | 479c7a5645b6f3f9bf478f925fa2009597871a7b (diff) | |
Fix some things I broke
patchset2: use is2xx() in TopicResourceTest
Change-Id: Icb6711f290164c4a2c952d5250746f274a048a73
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1095
Signed-off-by: dglFromAtt <dgl@research.att.com>
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java | 16 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java index 2be1b33..688bbce 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java @@ -49,6 +49,7 @@ public class MrProvConnection extends BaseLoggingClass{ private String authMethod; private String user; private String encPwd; + private String unit_test; private boolean hostnameVerify; public MrProvConnection() { @@ -60,6 +61,7 @@ public class MrProvConnection extends BaseLoggingClass{ authMethod = p.getProperty("MR.authentication", "none"); topicMgrCred = getCred(); hostnameVerify= "true".equalsIgnoreCase(p.getProperty("MR.hostnameVerify", "true")); + unit_test = p.getProperty( "UnitTest", "No" ); } @@ -199,11 +201,17 @@ public class MrProvConnection extends BaseLoggingClass{ err.setFields( uc.getURL().getHost()); return new String( "500: " + uhe.getMessage()); }catch ( ConnectException ce ) { - errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, "HTTP Connection Exception" ); - err.setCode(500); - err.setMessage("HTTP Connection Exception"); - err.setFields( uc.getURL().getHost()); + if ( unit_test.equals( "Yes" ) ) { + err.setCode(200); + err.setMessage( "simulated response"); + logger.info( "artificial 200 response from doPostMessage because unit_test =" + unit_test ); + } else { + errorLogger.error( DmaapbcLogMessageEnum.HTTP_CONNECTION_EXCEPTION, provURL, "HTTP Connection Exception" ); + err.setCode(500); + err.setMessage("HTTP Connection Exception"); + err.setFields( uc.getURL().getHost()); return new String( "500: " + ce.getMessage()); + } } rc = uc.getResponseCode(); logger.info( "http response code:" + rc ); diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java index 0a5f91a..b3f713f 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java @@ -204,9 +204,9 @@ public class MrTopicConnection extends BaseLoggingClass { } catch (Exception e) { if ( unit_test.equals( "Yes" ) ) { - response.setCode(200); + response.setCode(201); response.setMessage( "simulated response"); - logger.info( "artificial 200 response from doPostMessage because unit_test =" + unit_test ); + logger.info( "artificial 201 response from doPostMessage because unit_test =" + unit_test ); } else { response.setCode(500); |