diff options
author | 2018-05-17 09:02:22 +0000 | |
---|---|---|
committer | 2018-05-17 09:02:22 +0000 | |
commit | 797e824f18e784b8ded9a00d2ca7f420a53e6fff (patch) | |
tree | 08d92b508f0d466f10ec494975d3c8dd6425989b /prh-aai-client | |
parent | 058b05d999484702de52c26672a247aa4d6745fb (diff) | |
parent | a24561f9cd032c03af2b15f9452642cb994f68e2 (diff) |
Merge changes from topic 'PackageRefactor'
* changes:
Change package in prh-aai-client
Change package in prh-dmaap-client module
Diffstat (limited to 'prh-aai-client')
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AAIClientConfiguration.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIClientConfiguration.java) | 2 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClient.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClient.java) | 2 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClientImpl.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java) | 4 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIConsumerClient.java) | 6 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIExtendedHttpClient.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClient.java) | 2 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIProducerClient.java) | 6 | ||||
-rw-r--r-- | prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java (renamed from prh-aai-client/src/main/java/org/onap/dcaegen2/services/utils/HttpUtils.java) | 2 | ||||
-rw-r--r-- | prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClientTest.java (renamed from prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIConsumerClientTest.java) | 4 | ||||
-rw-r--r-- | prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIHttpClientImplTest.java (renamed from prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java) | 4 | ||||
-rw-r--r-- | prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIProducerClientTest.java (renamed from prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIProducerClientTest.java) | 4 | ||||
-rw-r--r-- | prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java (renamed from prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java) | 6 | ||||
-rw-r--r-- | prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java (renamed from prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpUtilsTest.java) | 4 |
12 files changed, 23 insertions, 23 deletions
diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIClientConfiguration.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AAIClientConfiguration.java index 5a3bffc6..d652ccb7 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/config/AAIClientConfiguration.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/config/AAIClientConfiguration.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.config; +package org.onap.dcaegen2.services.prh.config; import java.io.Serializable; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClient.java index 33a8d644..09d7f6ae 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClientImpl.java index 785ff972..5e938528 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIClientImpl.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIClientImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; @@ -31,7 +31,7 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.TrustStrategy; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIConsumerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java index edf2492f..0ada9072 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIConsumerClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.HttpEntity; import org.apache.http.client.ResponseHandler; @@ -27,9 +27,9 @@ import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.utils.URIBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.utils.HttpUtils; +import org.onap.dcaegen2.services.prh.utils.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIExtendedHttpClient.java index 690300dd..cb884aed 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIExtendedHttpClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIExtendedHttpClient.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIProducerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java index 4c459bc4..3a07e94d 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/service/AAIProducerClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -29,10 +29,10 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import org.onap.dcaegen2.services.prh.model.CommonFunctions; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.utils.HttpUtils; +import org.onap.dcaegen2.services.prh.utils.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/utils/HttpUtils.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java index 20bc7e00..3d5c3abf 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/utils/HttpUtils.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.utils; +package org.onap.dcaegen2.services.prh.utils; import org.apache.http.HttpStatus; diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIConsumerClientTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClientTest.java index 375d7ee4..6045c007 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIConsumerClientTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClientTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; @@ -26,7 +26,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import java.io.IOException; diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIHttpClientImplTest.java index cfe1a7f6..0e713856 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIHttpClientImplTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIHttpClientImplTest.java @@ -17,11 +17,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIProducerClientTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIProducerClientTest.java index a83dbefe..dbe857e6 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/AAIProducerClientTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/AAIProducerClientTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service; +package org.onap.dcaegen2.services.prh.service; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpPatch; @@ -26,7 +26,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModelForUnitTest; diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java index 447e0ecc..929d3f18 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/config/AAIHttpClientConfigurationTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/config/AAIHttpClientConfigurationTest.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service.config; +package org.onap.dcaegen2.services.prh.service.config; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.config.AAIClientConfiguration; -import org.onap.dcaegen2.services.config.ImmutableAAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.AAIClientConfiguration; +import org.onap.dcaegen2.services.prh.config.ImmutableAAIClientConfiguration; public class AAIHttpClientConfigurationTest { diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpUtilsTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java index 53b31da2..87a14799 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/service/utils/HttpUtilsTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.onap.dcaegen2.services.service.utils; +package org.onap.dcaegen2.services.prh.service.utils; import org.apache.http.HttpStatus; import org.junit.Test; -import org.onap.dcaegen2.services.utils.HttpUtils; +import org.onap.dcaegen2.services.prh.utils.HttpUtils; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; |