From ae993816c1dbe800dffe0c9e0dada126a57860e6 Mon Sep 17 00:00:00 2001 From: Eoin Hanan Date: Wed, 16 Jan 2019 16:30:32 +0000 Subject: [PATCH] Added CorsConfigurer class and cleaned up typos Change-Id: If133419e4ddb7aa4b8b0a199a57e1eaf9a8386c7 Issue-ID: SO-1335 Signed-off-by: Eoin Hanan --- .../camunda/model/ActivityInstance.java | 4 +- .../camunda/model/ProcessDefinition.java | 4 +- .../camunda/model/ProcessInstance.java | 4 +- .../camunda/model/ProcessInstanceVariable.java | 4 +- .../camunda/model/SoActiveInfraRequests.java | 4 +- .../camunda/CamundaConfiguration.java | 2 +- .../camunda/CamundaRestUrlProvider.java | 2 +- .../database/DatabaseConfiguration.java | 2 +- .../database/DatabaseUrlProvider.java | 2 +- .../BasicAuthorizationHttpRequestInterceptor.java | 2 +- .../configuration/rest/CorsConfigurer.java | 52 ++++++++++++++++++++++ .../rest/HttpClientConnectionConfiguration.java | 2 +- .../rest/HttpServiceProviderConfiguration.java | 10 ++--- .../rest/RestTemplateConfiguration.java} | 4 +- .../db/service/DatabaseServiceProvider.java | 4 +- .../db/service/DatabaseServiceProviderImpl.java | 14 +++--- .../exception/InvalidRestRequestException.java | 2 +- .../exception/RestProcessingException.java | 2 +- .../model/ActivityInstanceDetail.java | 4 +- .../model/ProcessDefinitionDetail.java | 4 +- .../model/ProcessInstanceDetail.java | 4 +- .../model/ProcessInstanceIdDetail.java | 4 +- .../model/ProcessInstanceVariableDetail.java | 4 +- .../model/SoInfraRequest.java | 4 +- .../model/SoInfraRequestBuilder.java | 2 +- .../service/CamundaProcessDataServiceProvider.java | 12 ++--- .../CamundaProcessDataServiceProviderImpl.java | 24 +++++----- .../rest/service/HttpRestServiceProvider.java | 2 +- .../rest/service/HttpRestServiceProviderImpl.java | 6 +-- .../utils/ObjectEqualsUtils.java | 2 +- .../configuration/CamundaConfigurationTest.java | 6 +-- .../configuration/CamundaRestUrlProviderTest.java | 4 +- .../HttpServiceProviderConfigurationTest.java | 6 +-- .../montoring/configuration/PojoClassesTests.java | 10 ++--- .../database/DatabaseUrlProviderTest.java | 2 +- .../db/api/DatabaseServiceProviderTest.java | 14 +++--- .../CamundaProcessDataServiceProviderTest.java | 20 ++++----- .../so/montoring/utils/ObjectEqualsUtilsTest.java | 2 +- .../rest/api/SoMonitoringController.java | 20 ++++----- .../rest/api/SoMonitoringControllerTest.java | 14 +++--- 40 files changed, 171 insertions(+), 119 deletions(-) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/camunda/model/ActivityInstance.java (97%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/camunda/model/ProcessDefinition.java (95%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/camunda/model/ProcessInstance.java (97%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/camunda/model/ProcessInstanceVariable.java (95%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/camunda/model/SoActiveInfraRequests.java (98%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/camunda/CamundaConfiguration.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/camunda/CamundaRestUrlProvider.java (98%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/database/DatabaseConfiguration.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/database/DatabaseUrlProvider.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java (97%) create mode 100644 so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/CorsConfigurer.java rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/rest/HttpClientConnectionConfiguration.java (98%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/configuration/rest/HttpServiceProviderConfiguration.java (88%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring/configuration/rest/RestTemplateConfigration.java => monitoring/configuration/rest/RestTemplateConfiguration.java} (97%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/db/service/DatabaseServiceProvider.java (92%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/db/service/DatabaseServiceProviderImpl.java (87%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/exception/InvalidRestRequestException.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/exception/RestProcessingException.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/ActivityInstanceDetail.java (98%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/ProcessDefinitionDetail.java (95%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/ProcessInstanceDetail.java (97%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/ProcessInstanceIdDetail.java (94%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/ProcessInstanceVariableDetail.java (95%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/SoInfraRequest.java (97%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/model/SoInfraRequestBuilder.java (99%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/rest/service/CamundaProcessDataServiceProvider.java (81%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/rest/service/CamundaProcessDataServiceProviderImpl.java (91%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/rest/service/HttpRestServiceProvider.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/rest/service/HttpRestServiceProviderImpl.java (96%) rename so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/{montoring => monitoring}/utils/ObjectEqualsUtils.java (97%) diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ActivityInstance.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ActivityInstance.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java index 10ca6c9ac3..f92d9fcbfe 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ActivityInstance.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.camunda.model; +package org.onap.so.monitoring.camunda.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessDefinition.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java similarity index 95% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessDefinition.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java index ccddf0cd95..c38cbcf5c3 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessDefinition.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.camunda.model; +package org.onap.so.monitoring.camunda.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstance.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstance.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java index faea7b3bf9..0a2db7dea7 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstance.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.camunda.model; +package org.onap.so.monitoring.camunda.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstanceVariable.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java similarity index 95% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstanceVariable.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java index 14a01b96bb..4154133cce 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/ProcessInstanceVariable.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.camunda.model; +package org.onap.so.monitoring.camunda.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/SoActiveInfraRequests.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java similarity index 98% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/SoActiveInfraRequests.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java index b17cad23b5..124101a999 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/camunda/model/SoActiveInfraRequests.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.camunda.model; +package org.onap.so.monitoring.camunda.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaConfiguration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaConfiguration.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaConfiguration.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaConfiguration.java index 2540eda04b..e5194da8f0 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaConfiguration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaConfiguration.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.camunda; +package org.onap.so.monitoring.configuration.camunda; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaRestUrlProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java similarity index 98% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaRestUrlProvider.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java index 9a509f037b..dc887bbac1 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/camunda/CamundaRestUrlProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.camunda; +package org.onap.so.monitoring.configuration.camunda; import java.net.URI; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseConfiguration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseConfiguration.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseConfiguration.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseConfiguration.java index 3d2b529d9a..359c334cde 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseConfiguration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseConfiguration.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.database; +package org.onap.so.monitoring.configuration.database; import org.springframework.beans.factory.annotation.Value; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseUrlProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseUrlProvider.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java index 8235b9272b..7531cfcf7e 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/database/DatabaseUrlProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.database; +package org.onap.so.monitoring.configuration.database; import java.net.URI; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java index 0db1e51ce2..34afd825cb 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/BasicAuthorizationHttpRequestInterceptor.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.rest; +package org.onap.so.monitoring.configuration.rest; import java.io.IOException; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/CorsConfigurer.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/CorsConfigurer.java new file mode 100644 index 0000000000..557e2a63b7 --- /dev/null +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/CorsConfigurer.java @@ -0,0 +1,52 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2018 Ericsson. 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.so.monitoring.configuration.rest; + +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +import java.util.concurrent.TimeUnit; + +/** + * @author waqas.ikram@ericsson, eoin.hanan@ericsson.com + */ +@Configuration +public class CorsConfigurer { + + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOrigin("*"); + config.addAllowedHeader("*"); + config.addAllowedMethod("*"); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} + + diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpClientConnectionConfiguration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpClientConnectionConfiguration.java similarity index 98% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpClientConnectionConfiguration.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpClientConnectionConfiguration.java index a465b53c71..1260e535a1 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpClientConnectionConfiguration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpClientConnectionConfiguration.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.rest; +package org.onap.so.monitoring.configuration.rest; import java.util.concurrent.TimeUnit; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpServiceProviderConfiguration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java similarity index 88% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpServiceProviderConfiguration.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java index 31cd12bebc..a590d7908f 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/HttpServiceProviderConfiguration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.rest; +package org.onap.so.monitoring.configuration.rest; -import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.CAMUNDA_REST_TEMPLATE; -import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.DATABASE_REST_TEMPLATE; +import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.CAMUNDA_REST_TEMPLATE; +import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.DATABASE_REST_TEMPLATE; -import org.onap.so.montoring.rest.service.HttpRestServiceProvider; -import org.onap.so.montoring.rest.service.HttpRestServiceProviderImpl; +import org.onap.so.monitoring.rest.service.HttpRestServiceProvider; +import org.onap.so.monitoring.rest.service.HttpRestServiceProviderImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/RestTemplateConfiguration.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/RestTemplateConfiguration.java index a30628b1d5..f8f0f687cf 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/configuration/rest/RestTemplateConfigration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/RestTemplateConfiguration.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.rest; +package org.onap.so.monitoring.configuration.rest; import java.util.concurrent.TimeUnit; @@ -37,7 +37,7 @@ import org.springframework.web.client.RestTemplate; * @author waqas.ikram@ericsson.com */ @Configuration -public class RestTemplateConfigration { +public class RestTemplateConfiguration { public static final String DATABASE_REST_TEMPLATE = "databaseRestTemplate"; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java similarity index 92% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProvider.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java index b8481803e2..209fac8fe1 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java @@ -17,12 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.db.service; +package org.onap.so.monitoring.db.service; import java.util.List; import java.util.Map; -import org.onap.so.montoring.model.SoInfraRequest; +import org.onap.so.monitoring.model.SoInfraRequest; /** diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java similarity index 87% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProviderImpl.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java index f6cbc3c297..6be6367302 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/db/service/DatabaseServiceProviderImpl.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java @@ -17,20 +17,20 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.db.service; +package org.onap.so.monitoring.db.service; -import static org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration.DATABASE_HTTP_REST_SERVICE_PROVIDER; +import static org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration.DATABASE_HTTP_REST_SERVICE_PROVIDER; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.so.montoring.camunda.model.SoActiveInfraRequests; -import org.onap.so.montoring.configuration.database.DatabaseUrlProvider; -import org.onap.so.montoring.model.SoInfraRequest; -import org.onap.so.montoring.model.SoInfraRequestBuilder; -import org.onap.so.montoring.rest.service.HttpRestServiceProvider; +import org.onap.so.monitoring.camunda.model.SoActiveInfraRequests; +import org.onap.so.monitoring.configuration.database.DatabaseUrlProvider; +import org.onap.so.monitoring.model.SoInfraRequest; +import org.onap.so.monitoring.model.SoInfraRequestBuilder; +import org.onap.so.monitoring.rest.service.HttpRestServiceProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/InvalidRestRequestException.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/InvalidRestRequestException.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/InvalidRestRequestException.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/InvalidRestRequestException.java index 8e4c751c8e..4d3c489fa9 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/InvalidRestRequestException.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/InvalidRestRequestException.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.exception; +package org.onap.so.monitoring.exception; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/RestProcessingException.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/RestProcessingException.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/RestProcessingException.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/RestProcessingException.java index 2d3544ed66..ab25854542 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/exception/RestProcessingException.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/exception/RestProcessingException.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.exception; +package org.onap.so.monitoring.exception; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ActivityInstanceDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ActivityInstanceDetail.java similarity index 98% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ActivityInstanceDetail.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ActivityInstanceDetail.java index 5691f23622..2b26a4a25c 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ActivityInstanceDetail.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ActivityInstanceDetail.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessDefinitionDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessDefinitionDetail.java similarity index 95% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessDefinitionDetail.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessDefinitionDetail.java index 164a3921c0..5e988f6aa6 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessDefinitionDetail.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessDefinitionDetail.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceDetail.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceDetail.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceDetail.java index a96b6c3a0f..2f8e756b8c 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceDetail.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceDetail.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceIdDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java similarity index 94% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceIdDetail.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java index b0bb7acc75..06a08f2027 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceIdDetail.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceVariableDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceVariableDetail.java similarity index 95% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceVariableDetail.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceVariableDetail.java index 9674dfea4d..a52121d7c5 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/ProcessInstanceVariableDetail.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceVariableDetail.java @@ -17,12 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; /** * @author waqas.ikram@ericsson.com */ -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; public class ProcessInstanceVariableDetail { diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequest.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequest.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java index ca392496eb..e16cd14598 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequest.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; -import static org.onap.so.montoring.utils.ObjectEqualsUtils.isEqual; +import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequestBuilder.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java similarity index 99% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequestBuilder.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java index 3b996f758e..cdaf7641c8 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/model/SoInfraRequestBuilder.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.model; +package org.onap.so.monitoring.model; import java.sql.Timestamp; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java similarity index 81% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProvider.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java index 81e30f1176..e0e0432452 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java @@ -17,15 +17,15 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.rest.service; +package org.onap.so.monitoring.rest.service; import java.util.List; -import org.onap.so.montoring.model.ActivityInstanceDetail; -import org.onap.so.montoring.model.ProcessDefinitionDetail; -import org.onap.so.montoring.model.ProcessInstanceDetail; -import org.onap.so.montoring.model.ProcessInstanceIdDetail; -import org.onap.so.montoring.model.ProcessInstanceVariableDetail; +import org.onap.so.monitoring.model.ActivityInstanceDetail; +import org.onap.so.monitoring.model.ProcessDefinitionDetail; +import org.onap.so.monitoring.model.ProcessInstanceDetail; +import org.onap.so.monitoring.model.ProcessInstanceIdDetail; +import org.onap.so.monitoring.model.ProcessInstanceVariableDetail; import com.google.common.base.Optional; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java similarity index 91% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderImpl.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java index 2515c8f79b..e6fbb68456 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderImpl.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java @@ -17,24 +17,24 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.rest.service; +package org.onap.so.monitoring.rest.service; -import static org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration.CAMUNDA_HTTP_REST_SERVICE_PROVIDER; +import static org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration.CAMUNDA_HTTP_REST_SERVICE_PROVIDER; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.onap.so.montoring.camunda.model.ActivityInstance; -import org.onap.so.montoring.camunda.model.ProcessDefinition; -import org.onap.so.montoring.camunda.model.ProcessInstance; -import org.onap.so.montoring.camunda.model.ProcessInstanceVariable; -import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider; -import org.onap.so.montoring.model.ActivityInstanceDetail; -import org.onap.so.montoring.model.ProcessDefinitionDetail; -import org.onap.so.montoring.model.ProcessInstanceDetail; -import org.onap.so.montoring.model.ProcessInstanceIdDetail; -import org.onap.so.montoring.model.ProcessInstanceVariableDetail; +import org.onap.so.monitoring.camunda.model.ActivityInstance; +import org.onap.so.monitoring.camunda.model.ProcessDefinition; +import org.onap.so.monitoring.camunda.model.ProcessInstance; +import org.onap.so.monitoring.camunda.model.ProcessInstanceVariable; +import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider; +import org.onap.so.monitoring.model.ActivityInstanceDetail; +import org.onap.so.monitoring.model.ProcessDefinitionDetail; +import org.onap.so.monitoring.model.ProcessInstanceDetail; +import org.onap.so.monitoring.model.ProcessInstanceIdDetail; +import org.onap.so.monitoring.model.ProcessInstanceVariableDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProvider.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProvider.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProvider.java index eb80ddcd78..4606c04e05 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProvider.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.rest.service; +package org.onap.so.monitoring.rest.service; import com.google.common.base.Optional; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProviderImpl.java similarity index 96% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProviderImpl.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProviderImpl.java index b5cafcf1ed..82a54c10a2 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/rest/service/HttpRestServiceProviderImpl.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/HttpRestServiceProviderImpl.java @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.rest.service; +package org.onap.so.monitoring.rest.service; -import org.onap.so.montoring.exception.InvalidRestRequestException; -import org.onap.so.montoring.exception.RestProcessingException; +import org.onap.so.monitoring.exception.InvalidRestRequestException; +import org.onap.so.monitoring.exception.RestProcessingException; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/utils/ObjectEqualsUtils.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/utils/ObjectEqualsUtils.java similarity index 97% rename from so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/utils/ObjectEqualsUtils.java rename to so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/utils/ObjectEqualsUtils.java index 496ad26bea..d8e331baae 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/montoring/utils/ObjectEqualsUtils.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/utils/ObjectEqualsUtils.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.utils; +package org.onap.so.monitoring.utils; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaConfigurationTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaConfigurationTest.java index de891dd01b..fb56d841e4 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaConfigurationTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaConfigurationTest.java @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration; +package org.onap.so.monitoring.configuration; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.onap.so.montoring.configuration.camunda.CamundaConfiguration; -import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider; +import org.onap.so.monitoring.configuration.camunda.CamundaConfiguration; +import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider; /** diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaRestUrlProviderTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaRestUrlProviderTest.java index 5fa9b447e6..3cd8a33d77 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaRestUrlProviderTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/CamundaRestUrlProviderTest.java @@ -17,14 +17,14 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration; +package org.onap.so.monitoring.configuration; import static org.junit.Assert.assertEquals; import java.util.UUID; import org.junit.Test; -import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider; +import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider; /** * @author waqas.ikram@ericsson.com diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/HttpServiceProviderConfigurationTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/HttpServiceProviderConfigurationTest.java index 13a2f98d57..1b3e168c12 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/HttpServiceProviderConfigurationTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/HttpServiceProviderConfigurationTest.java @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration; +package org.onap.so.monitoring.configuration; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.onap.so.montoring.configuration.rest.HttpServiceProviderConfiguration; -import org.onap.so.montoring.rest.service.HttpRestServiceProvider; +import org.onap.so.monitoring.configuration.rest.HttpServiceProviderConfiguration; +import org.onap.so.monitoring.rest.service.HttpRestServiceProvider; import org.springframework.web.client.RestTemplate; /** diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/PojoClassesTests.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/PojoClassesTests.java index 93dfa79990..f51d4c64b1 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/PojoClassesTests.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/PojoClassesTests.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration; +package org.onap.so.monitoring.configuration; import static org.junit.Assert.assertFalse; @@ -46,14 +46,14 @@ public class PojoClassesTests { @Test public void test_camunda_module_pojo_classes() throws ClassNotFoundException { - test("org.onap.so.montoring.camunda.model"); - assertEqualMethod("org.onap.so.montoring.camunda.model"); + test("org.onap.so.monitoring.camunda.model"); + assertEqualMethod("org.onap.so.monitoring.camunda.model"); } @Test public void test_so_monitoring_pojo_classes() throws ClassNotFoundException { - test("org.onap.so.montoring.model"); - assertEqualMethod("org.onap.so.montoring.model"); + test("org.onap.so.monitoring.model"); + assertEqualMethod("org.onap.so.monitoring.model"); } public void assertEqualMethod(final String pojoPackage) throws ClassNotFoundException { diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/database/DatabaseUrlProviderTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/database/DatabaseUrlProviderTest.java index d9d260992d..d820e9435d 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/database/DatabaseUrlProviderTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/configuration/database/DatabaseUrlProviderTest.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.configuration.database; +package org.onap.so.monitoring.configuration.database; import static org.junit.Assert.assertEquals; diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/db/api/DatabaseServiceProviderTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/db/api/DatabaseServiceProviderTest.java index 3bb7b289e4..8c06426217 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/db/api/DatabaseServiceProviderTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/db/api/DatabaseServiceProviderTest.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.db.api; +package org.onap.so.monitoring.db.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,12 +33,12 @@ import java.util.Map; import java.util.UUID; import org.junit.Test; -import org.onap.so.montoring.camunda.model.SoActiveInfraRequests; -import org.onap.so.montoring.configuration.database.DatabaseUrlProvider; -import org.onap.so.montoring.db.service.DatabaseServiceProvider; -import org.onap.so.montoring.db.service.DatabaseServiceProviderImpl; -import org.onap.so.montoring.model.SoInfraRequest; -import org.onap.so.montoring.rest.service.HttpRestServiceProvider; +import org.onap.so.monitoring.camunda.model.SoActiveInfraRequests; +import org.onap.so.monitoring.configuration.database.DatabaseUrlProvider; +import org.onap.so.monitoring.db.service.DatabaseServiceProvider; +import org.onap.so.monitoring.db.service.DatabaseServiceProviderImpl; +import org.onap.so.monitoring.model.SoInfraRequest; +import org.onap.so.monitoring.rest.service.HttpRestServiceProvider; import com.google.common.base.Optional; diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderTest.java index 351c476ca1..c3930df196 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/rest/service/CamundaProcessDataServiceProviderTest.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.rest.service; +package org.onap.so.monitoring.rest.service; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,15 +29,15 @@ import java.util.List; import java.util.UUID; import org.junit.Test; -import org.onap.so.montoring.camunda.model.ActivityInstance; -import org.onap.so.montoring.camunda.model.ProcessDefinition; -import org.onap.so.montoring.camunda.model.ProcessInstance; -import org.onap.so.montoring.camunda.model.ProcessInstanceVariable; -import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider; -import org.onap.so.montoring.model.ActivityInstanceDetail; -import org.onap.so.montoring.model.ProcessDefinitionDetail; -import org.onap.so.montoring.model.ProcessInstanceIdDetail; -import org.onap.so.montoring.model.ProcessInstanceVariableDetail; +import org.onap.so.monitoring.camunda.model.ActivityInstance; +import org.onap.so.monitoring.camunda.model.ProcessDefinition; +import org.onap.so.monitoring.camunda.model.ProcessInstance; +import org.onap.so.monitoring.camunda.model.ProcessInstanceVariable; +import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider; +import org.onap.so.monitoring.model.ActivityInstanceDetail; +import org.onap.so.monitoring.model.ProcessDefinitionDetail; +import org.onap.so.monitoring.model.ProcessInstanceIdDetail; +import org.onap.so.monitoring.model.ProcessInstanceVariableDetail; import com.google.common.base.Optional; diff --git a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/utils/ObjectEqualsUtilsTest.java b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/utils/ObjectEqualsUtilsTest.java index b1ad4eae12..dd363abe3a 100644 --- a/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/utils/ObjectEqualsUtilsTest.java +++ b/so-monitoring/so-monitoring-handler/src/test/java/org/onap/so/montoring/utils/ObjectEqualsUtilsTest.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ -package org.onap.so.montoring.utils; +package org.onap.so.monitoring.utils; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringController.java b/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringController.java index de2263be3f..155b4e65a4 100644 --- a/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringController.java +++ b/so-monitoring/so-monitoring-service/src/main/java/org/onap/so/monitoring/rest/api/SoMonitoringController.java @@ -32,16 +32,16 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.onap.so.montoring.db.service.DatabaseServiceProvider; -import org.onap.so.montoring.exception.InvalidRestRequestException; -import org.onap.so.montoring.exception.RestProcessingException; -import org.onap.so.montoring.model.ActivityInstanceDetail; -import org.onap.so.montoring.model.ProcessDefinitionDetail; -import org.onap.so.montoring.model.ProcessInstanceDetail; -import org.onap.so.montoring.model.ProcessInstanceIdDetail; -import org.onap.so.montoring.model.ProcessInstanceVariableDetail; -import org.onap.so.montoring.model.SoInfraRequest; -import org.onap.so.montoring.rest.service.CamundaProcessDataServiceProvider; +import org.onap.so.monitoring.db.service.DatabaseServiceProvider; +import org.onap.so.monitoring.exception.InvalidRestRequestException; +import org.onap.so.monitoring.exception.RestProcessingException; +import org.onap.so.monitoring.model.ActivityInstanceDetail; +import org.onap.so.monitoring.model.ProcessDefinitionDetail; +import org.onap.so.monitoring.model.ProcessInstanceDetail; +import org.onap.so.monitoring.model.ProcessInstanceIdDetail; +import org.onap.so.monitoring.model.ProcessInstanceVariableDetail; +import org.onap.so.monitoring.model.SoInfraRequest; +import org.onap.so.monitoring.rest.service.CamundaProcessDataServiceProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/so-monitoring/so-monitoring-service/src/test/java/org/onap/so/monitoring/rest/api/SoMonitoringControllerTest.java b/so-monitoring/so-monitoring-service/src/test/java/org/onap/so/monitoring/rest/api/SoMonitoringControllerTest.java index 13953b0331..ca2a88d4a8 100644 --- a/so-monitoring/so-monitoring-service/src/test/java/org/onap/so/monitoring/rest/api/SoMonitoringControllerTest.java +++ b/so-monitoring/so-monitoring-service/src/test/java/org/onap/so/monitoring/rest/api/SoMonitoringControllerTest.java @@ -22,7 +22,7 @@ package org.onap.so.monitoring.rest.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.onap.so.montoring.configuration.rest.RestTemplateConfigration.CAMUNDA_REST_TEMPLATE; +import static org.onap.so.monitoring.configuration.rest.RestTemplateConfiguration.CAMUNDA_REST_TEMPLATE; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; import static org.springframework.test.web.client.response.MockRestResponseCreators.withBadRequest; import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; @@ -41,12 +41,12 @@ import javax.ws.rs.core.Response.Status; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.so.montoring.configuration.camunda.CamundaRestUrlProvider; -import org.onap.so.montoring.model.ActivityInstanceDetail; -import org.onap.so.montoring.model.ProcessDefinitionDetail; -import org.onap.so.montoring.model.ProcessInstanceDetail; -import org.onap.so.montoring.model.ProcessInstanceIdDetail; -import org.onap.so.montoring.model.ProcessInstanceVariableDetail; +import org.onap.so.monitoring.configuration.camunda.CamundaRestUrlProvider; +import org.onap.so.monitoring.model.ActivityInstanceDetail; +import org.onap.so.monitoring.model.ProcessDefinitionDetail; +import org.onap.so.monitoring.model.ProcessInstanceDetail; +import org.onap.so.monitoring.model.ProcessInstanceIdDetail; +import org.onap.so.monitoring.model.ProcessInstanceVariableDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; -- 2.16.6