From a24561f9cd032c03af2b15f9452642cb994f68e2 Mon Sep 17 00:00:00 2001 From: wasala Date: Thu, 17 May 2018 08:33:34 +0200 Subject: Change package in prh-aai-client Move package org.onap.dcaegen2.services to org.onap.dcaegen2.services.prh Change-Id: I035175a2f7a56ff37c435eff71c5c8cf9065d651 Issue-ID: DCAEGEN2-396 Signed-off-by: wasala --- .../services/prh/service/AAIConsumerClient.java | 2 +- .../services/prh/service/AAIProducerClient.java | 2 +- .../dcaegen2/services/prh/utils/HttpUtils.java | 31 ++++++++++++++++++++++ .../onap/dcaegen2/services/utils/HttpUtils.java | 31 ---------------------- .../services/prh/service/utils/HttpUtilsTest.java | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java delete mode 100644 prh-aai-client/src/main/java/org/onap/dcaegen2/services/utils/HttpUtils.java diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java index 7836a75d..0ada9072 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIConsumerClient.java @@ -29,7 +29,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; 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/prh/service/AAIProducerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java index 0db9b114..3a07e94d 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java @@ -32,7 +32,7 @@ import org.apache.http.util.EntityUtils; 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/prh/utils/HttpUtils.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java new file mode 100644 index 00000000..3d5c3abf --- /dev/null +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/utils/HttpUtils.java @@ -0,0 +1,31 @@ +/*- + * ============LICENSE_START======================================================= + * PNF-REGISTRATION-HANDLER + * ================================================================================ + * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.prh.utils; + +import org.apache.http.HttpStatus; + +public final class HttpUtils implements HttpStatus { + + private HttpUtils() {} + + public static boolean isSuccessfulResponseCode(Integer statusCode) { + return statusCode >= 200 && statusCode < 300; + } +} 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/utils/HttpUtils.java deleted file mode 100644 index 20bc7e00..00000000 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/utils/HttpUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PNF-REGISTRATION-HANDLER - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. 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.dcaegen2.services.utils; - -import org.apache.http.HttpStatus; - -public final class HttpUtils implements HttpStatus { - - private HttpUtils() {} - - public static boolean isSuccessfulResponseCode(Integer statusCode) { - return statusCode >= 200 && statusCode < 300; - } -} diff --git a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java index 98e50cd7..87a14799 100644 --- a/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java +++ b/prh-aai-client/src/test/java/org/onap/dcaegen2/services/prh/service/utils/HttpUtilsTest.java @@ -22,7 +22,7 @@ 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; -- cgit 1.2.3-korg