diff options
Diffstat (limited to 'so-monitoring/so-monitoring-handler/src/main/java')
12 files changed, 11 insertions, 29 deletions
diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java index f92d9fcbfe..7ef00bd798 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ActivityInstance.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.camunda.model; import static org.onap.so.monitoring.utils.ObjectEqualsUtils.isEqual; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -184,5 +183,5 @@ public class ActivityInstance { } return false; } - + } diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java index c38cbcf5c3..76dc096c45 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessDefinition.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.camunda.model; 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/monitoring/camunda/model/ProcessInstance.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java index 0a2db7dea7..872fae50b0 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstance.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.camunda.model; 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/monitoring/camunda/model/ProcessInstanceVariable.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java index 4154133cce..6d7da58f90 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/ProcessInstanceVariable.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.camunda.model; 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/monitoring/camunda/model/SoActiveInfraRequests.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java index 124101a999..6c1d1ad99f 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/camunda/model/SoActiveInfraRequests.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.camunda.model; 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/monitoring/configuration/camunda/CamundaRestUrlProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java index dc887bbac1..ab23f24b2a 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/camunda/CamundaRestUrlProvider.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.configuration.camunda; import java.net.URI; - import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; @@ -52,8 +51,8 @@ public class CamundaRestUrlProvider { /** * see {@link <a href= - * "https://docs.camunda.org/manual/7.5/reference/rest/history/process-instance/get-process-instance/">Get - * Single Process Instance</a>}. + * "https://docs.camunda.org/manual/7.5/reference/rest/history/process-instance/get-process-instance/">Get Single + * Process Instance</a>}. * * @param processInstanceId the process instance id. * @return URL @@ -64,8 +63,7 @@ public class CamundaRestUrlProvider { } /** - * see {@link <a href= - * "https://docs.camunda.org/manual/7.5/reference/rest/process-definition/get-xml/">Get BPMN 2.0 + * see {@link <a href= "https://docs.camunda.org/manual/7.5/reference/rest/process-definition/get-xml/">Get BPMN 2.0 * XML</a>}. * * @param processDefinitionId the process definition id. @@ -78,8 +76,8 @@ public class CamundaRestUrlProvider { /** * see {@link <a href= - * "https://docs.camunda.org/manual/7.5/reference/rest/history/activity-instance/get-activity-instance/">Get - * Single Activity Instance (Historic)</a>}. + * "https://docs.camunda.org/manual/7.5/reference/rest/history/activity-instance/get-activity-instance/">Get Single + * Activity Instance (Historic)</a>}. * * @param processInstanceId the process instance id. * @return URL @@ -92,8 +90,8 @@ public class CamundaRestUrlProvider { /** * see {@link <a href= - * "https://docs.camunda.org/manual/7.5/reference/rest/history/variable-instance/get-variable-instance/">Get - * Single Variable Instance</a>}. + * "https://docs.camunda.org/manual/7.5/reference/rest/history/variable-instance/get-variable-instance/">Get Single + * Variable Instance</a>}. * * @param processInstanceId the process instance id. * @return URL diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java index 7531cfcf7e..67f588eb54 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/database/DatabaseUrlProvider.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.configuration.database; import java.net.URI; - import org.springframework.web.util.UriComponentsBuilder; /** diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java index 11c4d1b4f4..6d8d82bc44 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/configuration/rest/HttpServiceProviderConfiguration.java @@ -20,7 +20,6 @@ package org.onap.so.monitoring.configuration.rest; import static org.onap.so.client.RestTemplateConfig.CONFIGURABLE_REST_TEMPLATE; - import org.onap.so.configuration.rest.BasicHttpHeadersProvider; import org.onap.so.configuration.rest.HttpHeadersProvider; import org.onap.so.rest.service.HttpRestServiceProvider; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java index 209fac8fe1..b701203564 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProvider.java @@ -21,7 +21,6 @@ package org.onap.so.monitoring.db.service; import java.util.List; import java.util.Map; - import org.onap.so.monitoring.model.SoInfraRequest; diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java index 49e3d4f92f..9ef54272ef 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java @@ -20,12 +20,10 @@ package org.onap.so.monitoring.db.service; 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.monitoring.camunda.model.SoActiveInfraRequests; import org.onap.so.monitoring.configuration.database.DatabaseUrlProvider; import org.onap.so.monitoring.model.SoInfraRequest; @@ -34,7 +32,6 @@ import org.onap.so.rest.service.HttpRestServiceProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; - import com.google.common.base.Optional; /** diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java index e0e0432452..729e57b885 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProvider.java @@ -20,13 +20,11 @@ package org.onap.so.monitoring.rest.service; import java.util.List; - 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; /** @@ -35,13 +33,13 @@ import com.google.common.base.Optional; public interface CamundaProcessDataServiceProvider { Optional<ProcessInstanceIdDetail> getProcessInstanceIdDetail(final String requestId); - + Optional<ProcessInstanceDetail> getSingleProcessInstanceDetail(final String processInstanceId); Optional<ProcessDefinitionDetail> getProcessDefinition(final String processDefinitionId); - + List<ActivityInstanceDetail> getActivityInstance(final String processInstanceId); - + List<ProcessInstanceVariableDetail> getProcessInstanceVariable(final String processInstanceId); } diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java index b7a439fc28..e0996fd2ad 100644 --- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java +++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/rest/service/CamundaProcessDataServiceProviderImpl.java @@ -20,11 +20,9 @@ package org.onap.so.monitoring.rest.service; 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.monitoring.camunda.model.ActivityInstance; import org.onap.so.monitoring.camunda.model.ProcessDefinition; import org.onap.so.monitoring.camunda.model.ProcessInstance; @@ -41,7 +39,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; - import com.google.common.base.Optional; /** |