diff options
| -rwxr-xr-x | src/main/java/org/onap/dcae/collectors/restconf/common/RestConfProc.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/onap/dcae/collectors/restconf/common/RetryPolicyStoreTest.java | 63 |
2 files changed, 66 insertions, 1 deletions
diff --git a/src/main/java/org/onap/dcae/collectors/restconf/common/RestConfProc.java b/src/main/java/org/onap/dcae/collectors/restconf/common/RestConfProc.java index 5a4c880..cfebe3b 100755 --- a/src/main/java/org/onap/dcae/collectors/restconf/common/RestConfProc.java +++ b/src/main/java/org/onap/dcae/collectors/restconf/common/RestConfProc.java @@ -263,7 +263,9 @@ public class RestConfProc { String headerName = "X-ACCESS-TOKEN"; if (token == null) { headerName = HttpHeaders.AUTHORIZATION; - token = getAuthorizationToken(p.restapiUser, p.restapiPassword); + if(null!=p) { + token = getAuthorizationToken(p.restapiUser, p.restapiPassword); + } } AdditionalHeaderWebTarget newTarget = new AdditionalHeaderWebTarget(target, token, headerName); EventSource eventSource = EventSource.target(newTarget).build(); diff --git a/src/test/java/org/onap/dcae/collectors/restconf/common/RetryPolicyStoreTest.java b/src/test/java/org/onap/dcae/collectors/restconf/common/RetryPolicyStoreTest.java new file mode 100644 index 0000000..9508b1a --- /dev/null +++ b/src/test/java/org/onap/dcae/collectors/restconf/common/RetryPolicyStoreTest.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * org.onap.dcaegen2.collectors.restconf + * ================================================================================ + * Copyright (C) 2019 IBM. All rights reserved. + * ================================================================================ + * 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.dcae.collectors.restconf.common; + +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.*; + +public class RetryPolicyStoreTest { + + RetryPolicyStore retryPolicyStore; + String proxyServers; + + @Before + public void setUp() throws Exception { + retryPolicyStore = new RetryPolicyStore(); + proxyServers = "3.3.3.3,4.4.4.4,5.5.5.5"; + } + + @Test + public void getProxyServers() { + retryPolicyStore.setProxyServers(proxyServers); + assertThat(retryPolicyStore.getProxyServers(), is(proxyServers)); + } + + @Test + public void setProxyServers() throws RetryException { + retryPolicyStore.setProxyServers(proxyServers); + RetryPolicy actual = retryPolicyStore.getRetryPolicy("dme2proxy"); + assertThat(3, is(actual.getMaximumRetries())); + assertThat("4.4.4.4", is(actual.getNextHostName("3.3.3.3"))); + assertThat("5.5.5.5", is(actual.getNextHostName("4.4.4.4"))); + } + + @Test + public void getRetryPolicy() { + String[] adminServersArray = {"3.3.3.3","4.4.4.4","5.5.5.5"}; + RetryPolicy retryPolicy = new RetryPolicy(adminServersArray, adminServersArray.length); + retryPolicyStore.retryPolicies.put("dme2proxy", retryPolicy); + assertThat(retryPolicyStore.getRetryPolicy("dme2proxy"), is(retryPolicy)); + } +}
\ No newline at end of file |