diff options
Diffstat (limited to 'controlloop/common/model-impl/so/src/main/java')
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java) | 18 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java) | 64 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyExceptionHolder.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java) | 12 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java) | 12 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java) | 18 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java) | 46 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java) | 18 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java) | 4 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java) | 24 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java) | 36 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceExceptionHolder.java) | 6 | ||||
-rw-r--r-- | controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java (renamed from controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java) | 6 |
19 files changed, 153 insertions, 153 deletions
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java index 5bb03de06..a596b1b07 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoAsyncRequestStatus.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -25,7 +25,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.time.LocalDateTime; -public class SOAsyncRequestStatus implements Serializable { +public class SoAsyncRequestStatus implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -36,7 +36,7 @@ public class SOAsyncRequestStatus implements Serializable { private String requestId; @SerializedName("instanceReferences") - private SOInstanceReferences instanceReferences; + private SoInstanceReferences instanceReferences; @SerializedName("startTime") private LocalDateTime startTime; @@ -51,9 +51,9 @@ public class SOAsyncRequestStatus implements Serializable { private String requestType; @SerializedName("requestStatus") - private SORequestStatus requestStatus; + private SoRequestStatus requestStatus; - public SOAsyncRequestStatus() { + public SoAsyncRequestStatus() { // required by author } @@ -66,7 +66,7 @@ public class SOAsyncRequestStatus implements Serializable { return finishTime; } - public SOInstanceReferences getInstanceReferences() { + public SoInstanceReferences getInstanceReferences() { return instanceReferences; } @@ -78,7 +78,7 @@ public class SOAsyncRequestStatus implements Serializable { return requestScope; } - public SORequestStatus getRequestStatus() { + public SoRequestStatus getRequestStatus() { return requestStatus; } @@ -98,7 +98,7 @@ public class SOAsyncRequestStatus implements Serializable { this.finishTime = finishTime; } - public void setInstanceReferences(SOInstanceReferences instanceReferences) { + public void setInstanceReferences(SoInstanceReferences instanceReferences) { this.instanceReferences = instanceReferences; } @@ -110,7 +110,7 @@ public class SOAsyncRequestStatus implements Serializable { this.requestScope = requestScope; } - public void setRequestStatus(SORequestStatus requestStatus) { + public void setRequestStatus(SoRequestStatus requestStatus) { this.requestStatus = requestStatus; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java index b52fe2b7c..48a2489ab 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoCloudConfiguration.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOCloudConfiguration implements Serializable { +public class SoCloudConfiguration implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -34,7 +34,7 @@ public class SOCloudConfiguration implements Serializable { @SerializedName("tenantId") private String tenantId; - public SOCloudConfiguration() { + public SoCloudConfiguration() { //required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java index 645e7f711..f4065e613 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoInstanceReferences.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOInstanceReferences implements Serializable { +public class SoInstanceReferences implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -34,7 +34,7 @@ public class SOInstanceReferences implements Serializable { @SerializedName("instanceId") private String instanceId; - public SOInstanceReferences() { + public SoInstanceReferences() { //requried by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java index 6557be45e..632c48933 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoManager.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory; * http://onap.readthedocs.io/en/latest/submodules/so.git/docs/SO_R1_Interface.html#get-orchestration-request * */ -public final class SOManager { - private static final Logger logger = LoggerFactory.getLogger(SOManager.class); +public final class SoManager { + private static final Logger logger = LoggerFactory.getLogger(SoManager.class); private static final Logger netLogger = LoggerFactory.getLogger(org.onap.policy.common.endpoints.event.comm.Topic.NETWORK_LOGGER); private static ExecutorService executors = Executors.newCachedThreadPool(); @@ -65,7 +65,7 @@ public final class SOManager { /** * Default constructor. */ - public SOManager() { + public SoManager() { restManager = new RESTManager(); } @@ -79,8 +79,8 @@ public final class SOManager { * @param request the request to issue to SO * @return the SO Response object */ - public SOResponse createModuleInstance(final String url, final String urlBase, final String username, - final String password, final SORequest request) { + public SoResponse createModuleInstance(final String url, final String urlBase, final String username, + final String password, final SoRequest request) { // Issue the HTTP POST request to SO to create the service instance String requestJson = Serialization.gsonPretty.toJson(request); netLogger.info("[OUT|{}|{}|{}|{}|{}|{}|]{}{}", "SO", url, username, password, createSimpleHeaders(), MEDIA_TYPE, @@ -89,7 +89,7 @@ public final class SOManager { restManager.post(url, username, password, createSimpleHeaders(), MEDIA_TYPE, requestJson); // Process the response from SO - SOResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse); + SoResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse); if (SO_RESPONSE_ERROR != response.getHttpResponseCode()) { return response; } else { @@ -102,10 +102,10 @@ public final class SOManager { * except the vfModuleInstanceId is always null. * */ - public Future<SOResponse> asyncSORestCall(final String requestId, final WorkingMemory wm, + public Future<SoResponse> asyncSoRestCall(final String requestId, final WorkingMemory wm, final String serviceInstanceId, final String vnfInstanceId, - final SORequest request) { - return asyncSORestCall(requestId, wm, serviceInstanceId, vnfInstanceId, null, request); + final SoRequest request) { + return asyncSoRestCall(requestId, wm, serviceInstanceId, vnfInstanceId, null, request); } /** @@ -121,11 +121,11 @@ public final class SOManager { * @param request the SO request * @return a concurrent Future for the thread that handles the request */ - public Future<SOResponse> asyncSORestCall(final String requestId, + public Future<SoResponse> asyncSoRestCall(final String requestId, final WorkingMemory wm, final String serviceInstanceId, final String vnfInstanceId, - final String vfModuleInstanceId, final SORequest request) { + final String vfModuleInstanceId, final SoRequest request) { return executors.submit(new AsyncSoRestCallThread(requestId, wm, serviceInstanceId, vnfInstanceId, vfModuleInstanceId, request)); } @@ -133,13 +133,13 @@ public final class SOManager { /** * This class handles an asynchronous request to SO as a thread. */ - private class AsyncSoRestCallThread implements Callable<SOResponse> { + private class AsyncSoRestCallThread implements Callable<SoResponse> { final String requestId; final WorkingMemory wm; final String serviceInstanceId; final String vnfInstanceId; final String vfModuleInstanceId; - final SORequest request; + final SoRequest request; /** * Constructor, sets the context of the request. @@ -154,7 +154,7 @@ public final class SOManager { private AsyncSoRestCallThread(final String requestId, final WorkingMemory wm, final String serviceInstanceId, final String vnfInstanceId, final String vfModuleInstanceId, - final SORequest request) { + final SoRequest request) { this.requestId = requestId; this.wm = wm; this.serviceInstanceId = serviceInstanceId; @@ -167,7 +167,7 @@ public final class SOManager { * Process the asynchronous SO request. */ @Override - public SOResponse call() { + public SoResponse call() { String urlBase = PolicyEngine.manager.getEnvironmentProperty("so.url"); String username = PolicyEngine.manager.getEnvironmentProperty("so.username"); String password = PolicyEngine.manager.getEnvironmentProperty("so.password"); @@ -194,10 +194,10 @@ public final class SOManager { } // Process the response from SO - SOResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse); + SoResponse response = waitForSoOperationCompletion(urlBase, username, password, url, httpResponse); // Return the response to Drools in its working memory - SOResponseWrapper soWrapper = new SOResponseWrapper(response, requestId); + SoResponseWrapper soWrapper = new SoResponseWrapper(response, requestId); wm.insert(soWrapper); return response; @@ -207,27 +207,27 @@ public final class SOManager { /** * Wait for the SO operation we have ordered to complete. * - * @param urlBaseSO The base URL for SO + * @param urlBaseSo The base URL for SO * @param username user name on SO * @param password password on SO - * @param initialRequestURL The URL of the initial HTTP request - * @param initialHTTPResponse The initial HTTP message returned from SO + * @param initialRequestUrl The URL of the initial HTTP request + * @param initialHttpResponse The initial HTTP message returned from SO * @return The parsed final response of SO to the request */ - private SOResponse waitForSoOperationCompletion(final String urlBaseSO, final String username, - final String password, final String initialRequestURL, - final Pair<Integer, String> initialHTTPResponse) { + private SoResponse waitForSoOperationCompletion(final String urlBaseSo, final String username, + final String password, final String initialRequestUrl, + final Pair<Integer, String> initialHttpResponse) { // Process the initial response from SO, the response to a post - SOResponse response = processSoResponse(initialRequestURL, initialHTTPResponse); + SoResponse response = processSoResponse(initialRequestUrl, initialHttpResponse); if (SO_RESPONSE_ERROR == response.getHttpResponseCode()) { return response; } // The SO URL to use to get the status of orchestration requests - String urlGet = urlBaseSO + "/orchestrationRequests/v5/" + response.getRequestReferences().getRequestId(); + String urlGet = urlBaseSo + "/orchestrationRequests/v5/" + response.getRequestReferences().getRequestId(); // The HTTP status code of the latest response - Pair<Integer, String> latestHttpResponse = initialHTTPResponse; + Pair<Integer, String> latestHttpResponse = initialHttpResponse; // Wait for the response from SO for (int attemptsLeft = GET_REQUESTS_BEFORE_TIMEOUT; attemptsLeft >= 0; attemptsLeft--) { @@ -276,8 +276,8 @@ public final class SOManager { * @param httpResponse The HTTP message returned from SO * @return The parsed response */ - private SOResponse processSoResponse(final String requestUrl, final Pair<Integer, String> httpResponse) { - SOResponse response = new SOResponse(); + private SoResponse processSoResponse(final String requestUrl, final Pair<Integer, String> httpResponse) { + SoResponse response = new SoResponse(); // A null httpDetails indicates a HTTP problem, a valid response from SO must be // either 200 @@ -290,7 +290,7 @@ public final class SOManager { // Parse the JSON of the response into our POJO try { - response = Serialization.gsonPretty.fromJson(httpResponse.second, SOResponse.class); + response = Serialization.gsonPretty.fromJson(httpResponse.second, SoResponse.class); } catch (JsonSyntaxException e) { logger.error("Failed to deserialize HTTP response into SOResponse: ", e); response.setHttpResponseCode(SO_RESPONSE_ERROR); @@ -327,7 +327,7 @@ public final class SOManager { * @param response The response to check * @return true if the request for the response is defined */ - private boolean isRequestStateDefined(final SOResponse response) { + private boolean isRequestStateDefined(final SoResponse response) { return response != null && response.getRequest() != null && response.getRequest().getRequestStatus() != null && response.getRequest().getRequestStatus().getRequestState() != null; } @@ -339,7 +339,7 @@ public final class SOManager { * @param response The response to check * @return true if the request for the response is finished */ - private boolean isRequestStateFinished(final Pair<Integer, String> latestHttpDetails, final SOResponse response) { + private boolean isRequestStateFinished(final Pair<Integer, String> latestHttpDetails, final SoResponse response) { if (latestHttpDetails != null && 200 == latestHttpDetails.first && isRequestStateDefined(response)) { String requestState = response.getRequest().getRequestStatus().getRequestState(); return "COMPLETE".equalsIgnoreCase(requestState) || "FAILED".equalsIgnoreCase(requestState); diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java index 15cbd23d0..8ab13201c 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoModelInfo.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOModelInfo implements Serializable { +public class SoModelInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -49,7 +49,7 @@ public class SOModelInfo implements Serializable { @SerializedName("modelCustomizationId") private String modelCustomizationId; - public SOModelInfo() { + public SoModelInfo() { //required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyExceptionHolder.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java index 4c4fed1f2..0553eac76 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyExceptionHolder.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoPolicyExceptionHolder.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOPolicyExceptionHolder implements Serializable { +public class SoPolicyExceptionHolder implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -34,7 +34,7 @@ public class SOPolicyExceptionHolder implements Serializable { @SerializedName("text") private String text; - public SOPolicyExceptionHolder() { + public SoPolicyExceptionHolder() { //required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java index 90fe339ee..f4e329643 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstance.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORelatedInstance implements Serializable { +public class SoRelatedInstance implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -35,9 +35,9 @@ public class SORelatedInstance implements Serializable { private String instanceName; @SerializedName("modelInfo") - private SOModelInfo modelInfo; + private SoModelInfo modelInfo; - public SORelatedInstance() { + public SoRelatedInstance() { //required by author } @@ -50,7 +50,7 @@ public class SORelatedInstance implements Serializable { return instanceName; } - public SOModelInfo getModelInfo() { + public SoModelInfo getModelInfo() { return modelInfo; } @@ -63,7 +63,7 @@ public class SORelatedInstance implements Serializable { } - public void setModelInfo(SOModelInfo modelInfo) { + public void setModelInfo(SoModelInfo modelInfo) { this.modelInfo = modelInfo; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java index 4d3d27346..d4bf98680 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRelatedInstanceListElement.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,22 +24,22 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORelatedInstanceListElement implements Serializable { +public class SoRelatedInstanceListElement implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @SerializedName("relatedInstance") - private SORelatedInstance relatedInstance; + private SoRelatedInstance relatedInstance; - public SORelatedInstanceListElement() { + public SoRelatedInstanceListElement() { //required by author } - public SORelatedInstance getRelatedInstance() { + public SoRelatedInstance getRelatedInstance() { return relatedInstance; } - public void setRelatedInstance(SORelatedInstance relatedInstance) { + public void setRelatedInstance(SoRelatedInstance relatedInstance) { this.relatedInstance = relatedInstance; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java index 8bcbacf73..255c5b79e 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -26,7 +26,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.util.UUID; -public class SORequest implements Serializable { +public class SoRequest implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -46,14 +46,14 @@ public class SORequest implements Serializable { private String requestType; @SerializedName("requestDetails") - private SORequestDetails requestDetails; + private SoRequestDetails requestDetails; @SerializedName("requestStatus") - private SORequestStatus requestStatus; + private SoRequestStatus requestStatus; private transient SoOperationType operationType; - public SORequest() { + public SoRequest() { // required by author } @@ -61,7 +61,7 @@ public class SORequest implements Serializable { return finishTime; } - public SORequestDetails getRequestDetails() { + public SoRequestDetails getRequestDetails() { return requestDetails; } @@ -73,7 +73,7 @@ public class SORequest implements Serializable { return requestScope; } - public SORequestStatus getRequestStatus() { + public SoRequestStatus getRequestStatus() { return requestStatus; } @@ -89,7 +89,7 @@ public class SORequest implements Serializable { this.finishTime = finishTime; } - public void setRequestDetails(SORequestDetails requestDetails) { + public void setRequestDetails(SoRequestDetails requestDetails) { this.requestDetails = requestDetails; } @@ -101,7 +101,7 @@ public class SORequest implements Serializable { this.requestScope = requestScope; } - public void setRequestStatus(SORequestStatus requestStatus) { + public void setRequestStatus(SoRequestStatus requestStatus) { this.requestStatus = requestStatus; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java index 465895117..0ea1a272d 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestDetails.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -27,32 +27,32 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -public class SORequestDetails implements Serializable { +public class SoRequestDetails implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @SerializedName("modelInfo") - private SOModelInfo modelInfo; + private SoModelInfo modelInfo; @SerializedName("cloudConfiguration") - private SOCloudConfiguration cloudConfiguration; + private SoCloudConfiguration cloudConfiguration; @SerializedName("requestInfo") - private SORequestInfo requestInfo; + private SoRequestInfo requestInfo; @SerializedName("subscriberInfo") - private SOSubscriberInfo subscriberInfo; + private SoSubscriberInfo subscriberInfo; @SerializedName("relatedInstanceList") - private List<SORelatedInstanceListElement> relatedInstanceList = new LinkedList<>(); + private List<SoRelatedInstanceListElement> relatedInstanceList = new LinkedList<>(); @SerializedName("requestParameters") - private SORequestParameters requestParameters; + private SoRequestParameters requestParameters; @SerializedName("configurationParameters") private List<Map<String, String>> configurationParameters = new LinkedList<>(); - public SORequestDetails() { + public SoRequestDetails() { } @@ -61,7 +61,7 @@ public class SORequestDetails implements Serializable { * * @param soRequestDetails copy object */ - public SORequestDetails(SORequestDetails soRequestDetails) { + public SoRequestDetails(SoRequestDetails soRequestDetails) { this.modelInfo = soRequestDetails.modelInfo; this.cloudConfiguration = soRequestDetails.cloudConfiguration; this.requestInfo = soRequestDetails.requestInfo; @@ -81,7 +81,7 @@ public class SORequestDetails implements Serializable { if (getClass() != obj.getClass()) { return false; } - SORequestDetails other = (SORequestDetails) obj; + SoRequestDetails other = (SoRequestDetails) obj; if (cloudConfiguration == null) { if (other.cloudConfiguration != null) { return false; @@ -134,23 +134,23 @@ public class SORequestDetails implements Serializable { return true; } - public SOCloudConfiguration getCloudConfiguration() { + public SoCloudConfiguration getCloudConfiguration() { return cloudConfiguration; } - public SOModelInfo getModelInfo() { + public SoModelInfo getModelInfo() { return modelInfo; } - public List<SORelatedInstanceListElement> getRelatedInstanceList() { + public List<SoRelatedInstanceListElement> getRelatedInstanceList() { return relatedInstanceList; } - public SORequestInfo getRequestInfo() { + public SoRequestInfo getRequestInfo() { return requestInfo; } - public SORequestParameters getRequestParameters() { + public SoRequestParameters getRequestParameters() { return requestParameters; } @@ -158,7 +158,7 @@ public class SORequestDetails implements Serializable { return configurationParameters; } - public SOSubscriberInfo getSubscriberInfo() { + public SoSubscriberInfo getSubscriberInfo() { return subscriberInfo; } @@ -176,19 +176,19 @@ public class SORequestDetails implements Serializable { return result; } - public void setCloudConfiguration(SOCloudConfiguration cloudConfiguration) { + public void setCloudConfiguration(SoCloudConfiguration cloudConfiguration) { this.cloudConfiguration = cloudConfiguration; } - public void setModelInfo(SOModelInfo modelInfo) { + public void setModelInfo(SoModelInfo modelInfo) { this.modelInfo = modelInfo; } - public void setRequestInfo(SORequestInfo requestInfo) { + public void setRequestInfo(SoRequestInfo requestInfo) { this.requestInfo = requestInfo; } - public void setRequestParameters(SORequestParameters requestParameters) { + public void setRequestParameters(SoRequestParameters requestParameters) { this.requestParameters = requestParameters; } @@ -196,11 +196,11 @@ public class SORequestDetails implements Serializable { this.configurationParameters = configurationParameters; } - public void setSubscriberInfo(SOSubscriberInfo subscriberInfo) { + public void setSubscriberInfo(SoSubscriberInfo subscriberInfo) { this.subscriberInfo = subscriberInfo; } - public void setRelatedInstanceList(List<SORelatedInstanceListElement> relatedInstanceList) { + public void setRelatedInstanceList(List<SoRelatedInstanceListElement> relatedInstanceList) { this.relatedInstanceList = relatedInstanceList; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java index 7594ef95c..1214a6c8c 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestError.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,33 +24,33 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORequestError implements Serializable { +public class SoRequestError implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @SerializedName("policyException") - private SOPolicyExceptionHolder policyException; + private SoPolicyExceptionHolder policyException; @SerializedName("serviceException") - private SOServiceExceptionHolder serviceException; + private SoServiceExceptionHolder serviceException; - public SORequestError() { + public SoRequestError() { // required by author } - public SOPolicyExceptionHolder getPolicyException() { + public SoPolicyExceptionHolder getPolicyException() { return policyException; } - public SOServiceExceptionHolder getServiceException() { + public SoServiceExceptionHolder getServiceException() { return serviceException; } - public void setPolicyException(SOPolicyExceptionHolder policyException) { + public void setPolicyException(SoPolicyExceptionHolder policyException) { this.policyException = policyException; } - public void setServiceException(SOServiceExceptionHolder serviceException) { + public void setServiceException(SoServiceExceptionHolder serviceException) { this.serviceException = serviceException; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java index c30e50c17..ae0b57bc2 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestInfo.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORequestInfo implements Serializable { +public class SoRequestInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -58,7 +58,7 @@ public class SORequestInfo implements Serializable { @SerializedName("requestorId") private String requestorId; - public SORequestInfo() { + public SoRequestInfo() { // required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java index 69faded76..bc545455b 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestParameters.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -27,7 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -public class SORequestParameters implements Serializable { +public class SoRequestParameters implements Serializable { private static final long serialVersionUID = -3283942659786236033L; @@ -40,7 +40,7 @@ public class SORequestParameters implements Serializable { @SerializedName("userParams") private List<Map<String, String>> userParams = new LinkedList<>(); - public SORequestParameters() { + public SoRequestParameters() { // required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java index 71b1cccfe..8006142ed 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestReferences.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORequestReferences implements Serializable { +public class SoRequestReferences implements Serializable { private static final long serialVersionUID = -3283942659786236032L; diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java index 79406574d..2d2e5bf24 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoRequestStatus.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SORequestStatus implements Serializable { +public class SoRequestStatus implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -40,7 +40,7 @@ public class SORequestStatus implements Serializable { @SerializedName("wasRolledBack") private boolean wasRolledBack; - public SORequestStatus() { + public SoRequestStatus() { //required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java index e9350838a..08b01c9f8 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponse.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,22 +24,22 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOResponse implements Serializable { +public class SoResponse implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @SerializedName("requestReferences") - private SORequestReferences requestReferences; + private SoRequestReferences requestReferences; @SerializedName("requestError") - private SORequestError requestError; + private SoRequestError requestError; @SerializedName("request") - private SORequest request; + private SoRequest request; private int httpResponseCode; - public SOResponse() { + public SoResponse() { // required by author } @@ -47,15 +47,15 @@ public class SOResponse implements Serializable { return httpResponseCode; } - public SORequest getRequest() { + public SoRequest getRequest() { return request; } - public SORequestError getRequestError() { + public SoRequestError getRequestError() { return requestError; } - public SORequestReferences getRequestReferences() { + public SoRequestReferences getRequestReferences() { return requestReferences; } @@ -63,15 +63,15 @@ public class SOResponse implements Serializable { this.httpResponseCode = httpResponseCode; } - public void setRequest(SORequest request) { + public void setRequest(SoRequest request) { this.request = request; } - public void setRequestError(SORequestError requestError) { + public void setRequestError(SoRequestError requestError) { this.requestError = requestError; } - public void setRequestReferences(SORequestReferences requestReferences) { + public void setRequestReferences(SoRequestReferences requestReferences) { this.requestReferences = requestReferences; } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java index dcf640d83..4a53ee232 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponseWrapper.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoResponseWrapper.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,18 +24,18 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOResponseWrapper implements Serializable { +public class SoResponseWrapper implements Serializable { private static final long serialVersionUID = 7673023687132889069L; @SerializedName("SoResponse") - private SOResponse soResponse; + private SoResponse soResponse; - private transient String requestID; + private transient String requestId; - public SOResponseWrapper(SOResponse response, String reqID) { + public SoResponseWrapper(SoResponse response, String reqId) { this.soResponse = response; - this.requestID = reqID; + this.requestId = reqId; } @Override @@ -49,7 +49,7 @@ public class SOResponseWrapper implements Serializable { if (getClass() != obj.getClass()) { return false; } - SOResponseWrapper other = (SOResponseWrapper) obj; + SoResponseWrapper other = (SoResponseWrapper) obj; if (soResponse == null) { if (other.soResponse != null) { return false; @@ -58,22 +58,22 @@ public class SOResponseWrapper implements Serializable { else if (!soResponse.equals(other.soResponse)) { return false; } - if (requestID == null) { - if (other.requestID != null) { + if (requestId == null) { + if (other.requestId != null) { return false; } } - else if (!requestID.equals(other.requestID)) { + else if (!requestId.equals(other.requestId)) { return false; } return true; } - public String getRequestID() { - return requestID; + public String getRequestId() { + return requestId; } - public SOResponse getSoResponse() { + public SoResponse getSoResponse() { return soResponse; } @@ -82,21 +82,21 @@ public class SOResponseWrapper implements Serializable { final int prime = 31; int result = super.hashCode(); result = prime * result + ((soResponse == null) ? 0 : soResponse.hashCode()); - result = prime * result + ((requestID == null) ? 0 : requestID.hashCode()); + result = prime * result + ((requestId == null) ? 0 : requestId.hashCode()); return result; } - public void setRequestID(String requestId) { - this.requestID = requestId; + public void setRequestId(String requestId) { + this.requestId = requestId; } - public void setSoResponse(SOResponse response) { + public void setSoResponse(SoResponse response) { soResponse = response; } @Override public String toString() { - return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestID=" + requestID + "]"; + return "SOResponseWrapper [SOResponse=" + soResponse + ", RequestID=" + requestId + "]"; } } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceExceptionHolder.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java index 65ba446e3..5dd87e539 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceExceptionHolder.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoServiceExceptionHolder.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.LinkedList; import java.util.List; -public class SOServiceExceptionHolder implements Serializable { +public class SoServiceExceptionHolder implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -39,7 +39,7 @@ public class SOServiceExceptionHolder implements Serializable { @SerializedName("variables") private List<String> variables = new LinkedList<>(); - public SOServiceExceptionHolder() { + public SoServiceExceptionHolder() { // required by author } diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java index f7a4982a1..208cff23d 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SoSubscriberInfo.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * so * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T 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. @@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName; import java.io.Serializable; -public class SOSubscriberInfo implements Serializable { +public class SoSubscriberInfo implements Serializable { private static final long serialVersionUID = -3283942659786236032L; @@ -37,7 +37,7 @@ public class SOSubscriberInfo implements Serializable { @SerializedName("subscriberName") private String subscriberName; - public SOSubscriberInfo() { + public SoSubscriberInfo() { //required by author } |