Rename maven modules to mirror directory structure

The naming of Maven modules in drools-applications was not
aligned with the directory structure in the git repository
of drools-applications. Therefore it was difficult to
see the strucutre of the repository in Eclipse and other
IDEs. This change amends the Maven module IDs to
reflect the repository directory structure.

This patch reset fixes the previos patch set, where many
references to maven modules internally in drools-applciations
were missed. See also changes in engine and docker repos.

Updated to reflect repo directory structure in maven
artifact groups.

Issue-ID: POLICY-238
Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

14 files changed, 1057 insertions, 1057 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 2cc22f379..ea1257d4d 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
@@ -1,125 +1,125 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-import java.time.LocalDateTime;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOAsyncRequestStatus implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("correlator")

-    private String correlator;

-

-    @SerializedName("requestId")

-    private String requestId;

-

-    @SerializedName("instanceReferences")

-    private SOInstanceReferences instanceReferences;

-

-    @SerializedName("startTime")

-    private LocalDateTime startTime;

-

-    @SerializedName("finishTime")

-    private LocalDateTime finishTime;

-

-    @SerializedName("requestScope")

-    private String requestScope;

-

-    @SerializedName("requestType")

-    private String requestType;

-

-    @SerializedName("requestStatus")

-    private SORequestStatus requestStatus;

-

-    public SOAsyncRequestStatus() {

-        // required by author

-    }

-

-    public String getCorrelator() {

-        return correlator;

-    }

-

-

-    public LocalDateTime getFinishTime() {

-        return finishTime;

-    }

-

-    public SOInstanceReferences getInstanceReferences() {

-        return instanceReferences;

-    }

-

-    public String getRequestId() {

-        return requestId;

-    }

-

-    public String getRequestScope() {

-        return requestScope;

-    }

-

-    public SORequestStatus getRequestStatus() {

-        return requestStatus;

-    }

-

-    public String getRequestType() {

-        return requestType;

-    }

-

-    public LocalDateTime getStartTime() {

-        return startTime;

-    }

-

-    public void setCorrelator(String correlator) {

-        this.correlator = correlator;

-    }

-

-    public void setFinishTime(LocalDateTime finishTime) {

-        this.finishTime = finishTime;

-    }

-

-    public void setInstanceReferences(SOInstanceReferences instanceReferences) {

-        this.instanceReferences = instanceReferences;

-    }

-

-    public void setRequestId(String requestId) {

-        this.requestId = requestId;

-    }

-

-    public void setRequestScope(String requestScope) {

-        this.requestScope = requestScope;

-    }

-

-    public void setRequestStatus(SORequestStatus requestStatus) {

-        this.requestStatus = requestStatus;

-    }

-

-    public void setRequestType(String requestType) {

-        this.requestType = requestType;

-    }

-

-    public void setStartTime(LocalDateTime startTime) {

-        this.startTime = startTime;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOAsyncRequestStatus implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("correlator")
+    private String correlator;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    @SerializedName("instanceReferences")
+    private SOInstanceReferences instanceReferences;
+
+    @SerializedName("startTime")
+    private LocalDateTime startTime;
+
+    @SerializedName("finishTime")
+    private LocalDateTime finishTime;
+
+    @SerializedName("requestScope")
+    private String requestScope;
+
+    @SerializedName("requestType")
+    private String requestType;
+
+    @SerializedName("requestStatus")
+    private SORequestStatus requestStatus;
+
+    public SOAsyncRequestStatus() {
+        // required by author
+    }
+
+    public String getCorrelator() {
+        return correlator;
+    }
+
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public SOInstanceReferences getInstanceReferences() {
+        return instanceReferences;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public String getRequestScope() {
+        return requestScope;
+    }
+
+    public SORequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setCorrelator(String correlator) {
+        this.correlator = correlator;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public void setInstanceReferences(SOInstanceReferences instanceReferences) {
+        this.instanceReferences = instanceReferences;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public void setRequestScope(String requestScope) {
+        this.requestScope = requestScope;
+    }
+
+    public void setRequestStatus(SORequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+}
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 a1233bff1..7ad497a9f 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
@@ -1,57 +1,57 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOCloudConfiguration implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("lcpCloudRegionId")

-    private String lcpCloudRegionId;

-

-    @SerializedName("tenantId")

-    private String tenantId;

-

-    public SOCloudConfiguration() {

-        //required by author

-    }

-

-    public String getLcpCloudRegionId() {

-        return lcpCloudRegionId;

-    }

-

-    public String getTenantId() {

-        return tenantId;

-    }

-

-    public void setLcpCloudRegionId(String lcpCloudRegionId) {

-        this.lcpCloudRegionId = lcpCloudRegionId;

-    }

-

-    public void setTenantId(String tenantId) {

-        this.tenantId = tenantId;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOCloudConfiguration implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("lcpCloudRegionId")
+    private String lcpCloudRegionId;
+
+    @SerializedName("tenantId")
+    private String tenantId;
+
+    public SOCloudConfiguration() {
+        //required by author
+    }
+
+    public String getLcpCloudRegionId() {
+        return lcpCloudRegionId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setLcpCloudRegionId(String lcpCloudRegionId) {
+        this.lcpCloudRegionId = lcpCloudRegionId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+}
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 f2155082d..307e0514f 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
@@ -1,57 +1,57 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOInstanceReferences implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("requestId")

-    private String requestId;

-

-    @SerializedName("instanceId")

-    private String instanceId;

-

-    public SOInstanceReferences() {

-        //requried by author

-    }

-

-    public String getInstanceId() {

-        return instanceId;

-    }

-

-    public String getRequestId() {

-        return requestId;

-    }

-

-    public void setInstanceId(String instanceId) {

-        this.instanceId = instanceId;

-    }

-

-    public void setRequestId(String requestId) {

-        this.requestId = requestId;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOInstanceReferences implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    public SOInstanceReferences() {
+        //requried by author
+    }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+}
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 cab396d01..975a21cbc 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
@@ -1,57 +1,57 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOPolicyExceptionHolder implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("messageId")

-    private String messageId;

-

-    @SerializedName("text")

-    private String text;

-

-    public SOPolicyExceptionHolder() {

-      //required by author

-    }

-

-    public String getMessageId() {

-        return messageId;

-    }

-

-    public String getText() {

-        return text;

-    }

-

-    public void setMessageId(String messageId) {

-        this.messageId = messageId;

-    }

-

-    public void setText(String text) {

-        this.text = text;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOPolicyExceptionHolder implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("messageId")
+    private String messageId;
+
+    @SerializedName("text")
+    private String text;
+
+    public SOPolicyExceptionHolder() {
+      //required by author
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
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 2bd46e04c..e7f3efc57 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
@@ -1,70 +1,70 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORelatedInstance implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("instanceId")

-    private String instanceId;

-

-    @SerializedName("instanceName")

-    private String instanceName;

-

-    @SerializedName("modelInfo")

-    private SOModelInfo modelInfo;

-

-    public SORelatedInstance() {

-      //required by author

-    }

-

-    public String getInstanceId() {

-        return instanceId;

-    }

-

-

-    public String getInstanceName() {

-        return instanceName;

-    }

-

-    public SOModelInfo getModelInfo() {

-        return modelInfo;

-    }

-

-    public void setInstanceId(String instanceId) {

-        this.instanceId = instanceId;

-    }

-

-    public void setInstanceName(String instanceName) {

-        this.instanceName = instanceName;

-    }

-

-

-    public void setModelInfo(SOModelInfo modelInfo) {

-        this.modelInfo = modelInfo;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORelatedInstance implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    @SerializedName("instanceName")
+    private String instanceName;
+
+    @SerializedName("modelInfo")
+    private SOModelInfo modelInfo;
+
+    public SORelatedInstance() {
+      //required by author
+    }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public SOModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+
+    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 71fb11949..1148ef1e0 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
@@ -1,46 +1,46 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORelatedInstanceListElement implements Serializable {

- 

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("relatedInstance")

-    private SORelatedInstance relatedInstance;

-

-    public SORelatedInstanceListElement() {

-      //required by author

-    }

-

-    public SORelatedInstance getRelatedInstance() {

-        return relatedInstance;

-    }

-

-    public void setRelatedInstance(SORelatedInstance relatedInstance) {

-        this.relatedInstance = relatedInstance;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORelatedInstanceListElement implements Serializable {
+ 
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("relatedInstance")
+    private SORelatedInstance relatedInstance;
+
+    public SORelatedInstanceListElement() {
+      //required by author
+    }
+
+    public SORelatedInstance getRelatedInstance() {
+        return 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 be5ef139a..73ebba260 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
@@ -1,114 +1,114 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-import java.time.LocalDateTime;

-import java.util.UUID;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequest implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("requestId")

-    private UUID requestId;

-

-    @SerializedName("startTime")

-    private String startTime;

-

-    @SerializedName("finishTime")

-    private LocalDateTime finishTime;

-

-    @SerializedName("requestScope")

-    private String requestScope;

-

-    @SerializedName("requestType")

-    private String requestType;

-

-    @SerializedName("requestDetails")

-    private SORequestDetails requestDetails;

-

-    @SerializedName("requestStatus")

-    private SORequestStatus requestStatus;

-

-    public SORequest() {

-        // required by author

-    }

-

-    public LocalDateTime getFinishTime() {

-        return finishTime;

-    }

-

-    public SORequestDetails getRequestDetails() {

-        return requestDetails;

-    }

-

-    public UUID getRequestId() {

-        return requestId;

-    }

-

-    public String getRequestScope() {

-        return requestScope;

-    }

-

-    public SORequestStatus getRequestStatus() {

-        return requestStatus;

-    }

-

-    public String getRequestType() {

-        return requestType;

-    }

-

-    public String getStartTime() {

-        return startTime;

-    }

-

-    public void setFinishTime(LocalDateTime finishTime) {

-        this.finishTime = finishTime;

-    }

-

-    public void setRequestDetails(SORequestDetails requestDetails) {

-        this.requestDetails = requestDetails;

-    }

-

-    public void setRequestId(UUID requestId) {

-        this.requestId = requestId;

-    }

-

-    public void setRequestScope(String requestScope) {

-        this.requestScope = requestScope;

-    }

-

-    public void setRequestStatus(SORequestStatus requestStatus) {

-        this.requestStatus = requestStatus;

-    }

-

-    public void setRequestType(String requestType) {

-        this.requestType = requestType;

-    }

-

-    public void setStartTime(String startTime) {

-        this.startTime = startTime;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequest implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("requestId")
+    private UUID requestId;
+
+    @SerializedName("startTime")
+    private String startTime;
+
+    @SerializedName("finishTime")
+    private LocalDateTime finishTime;
+
+    @SerializedName("requestScope")
+    private String requestScope;
+
+    @SerializedName("requestType")
+    private String requestType;
+
+    @SerializedName("requestDetails")
+    private SORequestDetails requestDetails;
+
+    @SerializedName("requestStatus")
+    private SORequestStatus requestStatus;
+
+    public SORequest() {
+        // required by author
+    }
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public SORequestDetails getRequestDetails() {
+        return requestDetails;
+    }
+
+    public UUID getRequestId() {
+        return requestId;
+    }
+
+    public String getRequestScope() {
+        return requestScope;
+    }
+
+    public SORequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public void setRequestDetails(SORequestDetails requestDetails) {
+        this.requestDetails = requestDetails;
+    }
+
+    public void setRequestId(UUID requestId) {
+        this.requestId = requestId;
+    }
+
+    public void setRequestScope(String requestScope) {
+        this.requestScope = requestScope;
+    }
+
+    public void setRequestStatus(SORequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+}
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 49860417c..763210831 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
@@ -1,57 +1,57 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequestError implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("policyException")

-    private SOPolicyExceptionHolder policyException;

-

-    @SerializedName("serviceException")

-    private SOServiceExceptionHolder serviceException;

-

-    public SORequestError() {

-        // required by author

-    }

-

-    public SOPolicyExceptionHolder getPolicyException() {

-        return policyException;

-    }

-

-    public SOServiceExceptionHolder getServiceException() {

-        return serviceException;

-    }

-

-    public void setPolicyException(SOPolicyExceptionHolder policyException) {

-        this.policyException = policyException;

-    }

-

-    public void setServiceException(SOServiceExceptionHolder serviceException) {

-        this.serviceException = serviceException;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestError implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("policyException")
+    private SOPolicyExceptionHolder policyException;
+
+    @SerializedName("serviceException")
+    private SOServiceExceptionHolder serviceException;
+
+    public SORequestError() {
+        // required by author
+    }
+
+    public SOPolicyExceptionHolder getPolicyException() {
+        return policyException;
+    }
+
+    public SOServiceExceptionHolder getServiceException() {
+        return serviceException;
+    }
+
+    public void setPolicyException(SOPolicyExceptionHolder policyException) {
+        this.policyException = policyException;
+    }
+
+    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 28bc0b87e..fd92e3284 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
@@ -1,145 +1,145 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequestInfo implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("instanceName")

-    private String instanceName;

-

-    @SerializedName("source")

-    private String source;

-

-    @SerializedName("productFamilyId")

-    private String productFamilyId;

-

-    @SerializedName("suppressRollback")

-    private boolean suppressRollback;

-

-    @SerializedName("billingAccountNumber")

-    private String billingAccountNumber;

-

-    @SerializedName("callbackUrl")

-    private String callbackUrl;

-

-    @SerializedName("correlator")

-    private String correlator;

-

-    @SerializedName("orderNumber")

-    private String orderNumber;

-

-    @SerializedName("orderVersion")

-    private Integer orderVersion;

-

-    @SerializedName("requestorId")

-    private String requestorId;

-

-    public SORequestInfo() {

-        // required by author

-    }

-

-    public String getBillingAccountNumber() {

-        return billingAccountNumber;

-    }

-

-    public String getCallbackUrl() {

-        return callbackUrl;

-    }

-

-    public String getCorrelator() {

-        return correlator;

-    }

-

-    public String getInstanceName() {

-        return instanceName;

-    }

-

-    public String getOrderNumber() {

-        return orderNumber;

-    }

-

-    public Integer getOrderVersion() {

-        return orderVersion;

-    }

-

-    public String getProductFamilyId() {

-        return productFamilyId;

-    }

-

-    public String getRequestorId() {

-        return requestorId;

-    }

-

-    public String getSource() {

-        return source;

-    }

-

-    public boolean isSuppressRollback() {

-        return suppressRollback;

-    }

-

-    public void setBillingAccountNumber(String billingAccountNumber) {

-        this.billingAccountNumber = billingAccountNumber;

-    }

-

-    public void setCallbackUrl(String callbackUrl) {

-        this.callbackUrl = callbackUrl;

-    }

-

-    public void setCorrelator(String correlator) {

-        this.correlator = correlator;

-    }

-

-    public void setInstanceName(String instanceName) {

-        this.instanceName = instanceName;

-    }

-

-    public void setOrderNumber(String orderNumber) {

-        this.orderNumber = orderNumber;

-    }

-

-    public void setOrderVersion(Integer orderVersion) {

-        this.orderVersion = orderVersion;

-    }

-

-    public void setProductFamilyId(String productFamilyId) {

-        this.productFamilyId = productFamilyId;

-    }

-

-    public void setRequestorId(String requestorId) {

-        this.requestorId = requestorId;

-    }

-

-    public void setSource(String source) {

-        this.source = source;

-    }

-

-    public void setSuppressRollback(boolean suppressRollback) {

-        this.suppressRollback = suppressRollback;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestInfo implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceName")
+    private String instanceName;
+
+    @SerializedName("source")
+    private String source;
+
+    @SerializedName("productFamilyId")
+    private String productFamilyId;
+
+    @SerializedName("suppressRollback")
+    private boolean suppressRollback;
+
+    @SerializedName("billingAccountNumber")
+    private String billingAccountNumber;
+
+    @SerializedName("callbackUrl")
+    private String callbackUrl;
+
+    @SerializedName("correlator")
+    private String correlator;
+
+    @SerializedName("orderNumber")
+    private String orderNumber;
+
+    @SerializedName("orderVersion")
+    private Integer orderVersion;
+
+    @SerializedName("requestorId")
+    private String requestorId;
+
+    public SORequestInfo() {
+        // required by author
+    }
+
+    public String getBillingAccountNumber() {
+        return billingAccountNumber;
+    }
+
+    public String getCallbackUrl() {
+        return callbackUrl;
+    }
+
+    public String getCorrelator() {
+        return correlator;
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public Integer getOrderVersion() {
+        return orderVersion;
+    }
+
+    public String getProductFamilyId() {
+        return productFamilyId;
+    }
+
+    public String getRequestorId() {
+        return requestorId;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public boolean isSuppressRollback() {
+        return suppressRollback;
+    }
+
+    public void setBillingAccountNumber(String billingAccountNumber) {
+        this.billingAccountNumber = billingAccountNumber;
+    }
+
+    public void setCallbackUrl(String callbackUrl) {
+        this.callbackUrl = callbackUrl;
+    }
+
+    public void setCorrelator(String correlator) {
+        this.correlator = correlator;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setOrderVersion(Integer orderVersion) {
+        this.orderVersion = orderVersion;
+    }
+
+    public void setProductFamilyId(String productFamilyId) {
+        this.productFamilyId = productFamilyId;
+    }
+
+    public void setRequestorId(String requestorId) {
+        this.requestorId = requestorId;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public void setSuppressRollback(boolean suppressRollback) {
+        this.suppressRollback = suppressRollback;
+    }
+
+}
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 c1a6c7d85..169752057 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
@@ -1,60 +1,60 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequestParameters implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("subscriptionServiceType")

-    private String subscriptionServiceType;

-

-    @SerializedName("userParams")

-    private List<Map<String, String>> userParams = new LinkedList<>();

-

-    public SORequestParameters() {

-        // required by author

-    }

-

-    public String getSubscriptionServiceType() {

-        return subscriptionServiceType;

-    }

-

-    public List<Map<String, String>> getUserParams() {

-        return userParams;

-    }

-

-    public void setSubscriptionServiceType(String subscriptionServiceType) {

-        this.subscriptionServiceType = subscriptionServiceType;

-    }

-

-    public void setUserParams(List<Map<String, String>> userParams) {

-        this.userParams = userParams;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestParameters implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("subscriptionServiceType")
+    private String subscriptionServiceType;
+
+    @SerializedName("userParams")
+    private List<Map<String, String>> userParams = new LinkedList<>();
+
+    public SORequestParameters() {
+        // required by author
+    }
+
+    public String getSubscriptionServiceType() {
+        return subscriptionServiceType;
+    }
+
+    public List<Map<String, String>> getUserParams() {
+        return userParams;
+    }
+
+    public void setSubscriptionServiceType(String subscriptionServiceType) {
+        this.subscriptionServiceType = subscriptionServiceType;
+    }
+
+    public void setUserParams(List<Map<String, String>> userParams) {
+        this.userParams = userParams;
+    }
+
+}
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 913402db3..ed14f6b58 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
@@ -1,53 +1,53 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequestReferences implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("instanceId")

-    private String instanceId;

-

-    @SerializedName("requestId")

-    private String requestId;

-

-    public String getInstanceId() {

-        return instanceId;

-    }

-

-    public String getRequestId() {

-        return requestId;

-    }

-

-    public void setInstanceId(String instanceId) {

-        this.instanceId = instanceId;

-    }

-

-    public void setRequestId(String requestId) {

-        this.requestId = requestId;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestReferences implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+}
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 8c5e7848c..2e77c157b 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
@@ -1,82 +1,82 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SORequestStatus implements Serializable {

-

-    /**

-     * 

-     */

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("percentProgress")

-    private int percentProgress;

-

-    @SerializedName("requestState")

-    private String requestState;

-

-    @SerializedName("timestamp")

-    private String timestamp;

-

-    @SerializedName("wasRolledBack")

-    private boolean wasRolledBack;

-

-    public SORequestStatus() {

-      //required by author

-    }

-

-    public int getPercentProgress() {

-        return percentProgress;

-    }

-

-    public String getRequestState() {

-        return requestState;

-    }

-

-    public String getTimestamp() {

-        return timestamp;

-    }

-

-    public boolean isWasRolledBack() {

-        return wasRolledBack;

-    }

-

-    public void setPercentProgress(int percentProgress) {

-        this.percentProgress = percentProgress;

-    }

-

-    public void setRequestState(String requestState) {

-        this.requestState = requestState;

-    }

-

-    public void setTimestamp(String timestamp) {

-        this.timestamp = timestamp;

-    }

-

-    public void setWasRolledBack(boolean wasRolledBack) {

-        this.wasRolledBack = wasRolledBack;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestStatus implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("percentProgress")
+    private int percentProgress;
+
+    @SerializedName("requestState")
+    private String requestState;
+
+    @SerializedName("timestamp")
+    private String timestamp;
+
+    @SerializedName("wasRolledBack")
+    private boolean wasRolledBack;
+
+    public SORequestStatus() {
+      //required by author
+    }
+
+    public int getPercentProgress() {
+        return percentProgress;
+    }
+
+    public String getRequestState() {
+        return requestState;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public boolean isWasRolledBack() {
+        return wasRolledBack;
+    }
+
+    public void setPercentProgress(int percentProgress) {
+        this.percentProgress = percentProgress;
+    }
+
+    public void setRequestState(String requestState) {
+        this.requestState = requestState;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public void setWasRolledBack(boolean wasRolledBack) {
+        this.wasRolledBack = wasRolledBack;
+    }
+
+}
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 61366d3c5..703e13be5 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
@@ -1,66 +1,66 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-import java.util.LinkedList;

-import java.util.List;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOServiceExceptionHolder implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("messageId")

-    private String messageId;

-

-    @SerializedName("text")

-    private String text;

-

-    @SerializedName("variables")

-    private List<String> variables = new LinkedList<>();

-

-    public SOServiceExceptionHolder() {

-        // required by author

-    }

-

-    public String getMessageId() {

-        return messageId;

-    }

-

-    public String getText() {

-        return text;

-    }

-

-    public List<String> getVariables() {

-        return variables;

-    }

-

-    public void setMessageId(String messageId) {

-        this.messageId = messageId;

-    }

-

-    public void setText(String text) {

-        this.text = text;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOServiceExceptionHolder implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("messageId")
+    private String messageId;
+
+    @SerializedName("text")
+    private String text;
+
+    @SerializedName("variables")
+    private List<String> variables = new LinkedList<>();
+
+    public SOServiceExceptionHolder() {
+        // required by author
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public List<String> getVariables() {
+        return variables;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
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 14c46b0c1..618e9ec1e 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
@@ -1,68 +1,68 @@
-/*-

- * ============LICENSE_START=======================================================

- * so

- * ================================================================================

- * Copyright (C) 2017 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.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-package org.onap.policy.so;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class SOSubscriberInfo implements Serializable {

-

-    private static final long serialVersionUID = -3283942659786236032L;

-

-    @SerializedName("globalSubscriberId")

-    private String globalSubscriberId;

-

-    @SerializedName("subscriberCommonSiteId")

-    private String subscriberCommonSiteId;

-

-    @SerializedName("subscriberName")

-    private String subscriberName;

-

-    public SOSubscriberInfo() {

-        //required by author

-    }

-

-    public String getGlobalSubscriberId() {

-        return globalSubscriberId;

-    }

-

-    public String getSubscriberCommonSiteId() {

-        return subscriberCommonSiteId;

-    }

-

-    public String getSubscriberName() {

-        return subscriberName;

-    }

-

-    public void setGlobalSubscriberId(String globalSubscriberId) {

-        this.globalSubscriberId = globalSubscriberId;

-    }

-

-    public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {

-        this.subscriberCommonSiteId = subscriberCommonSiteId;

-    }

-

-    public void setSubscriberName(String subscriberName) {

-        this.subscriberName = subscriberName;

-    }

-

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOSubscriberInfo implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("globalSubscriberId")
+    private String globalSubscriberId;
+
+    @SerializedName("subscriberCommonSiteId")
+    private String subscriberCommonSiteId;
+
+    @SerializedName("subscriberName")
+    private String subscriberName;
+
+    public SOSubscriberInfo() {
+        //required by author
+    }
+
+    public String getGlobalSubscriberId() {
+        return globalSubscriberId;
+    }
+
+    public String getSubscriberCommonSiteId() {
+        return subscriberCommonSiteId;
+    }
+
+    public String getSubscriberName() {
+        return subscriberName;
+    }
+
+    public void setGlobalSubscriberId(String globalSubscriberId) {
+        this.globalSubscriberId = globalSubscriberId;
+    }
+
+    public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {
+        this.subscriberCommonSiteId = subscriberCommonSiteId;
+    }
+
+    public void setSubscriberName(String subscriberName) {
+        this.subscriberName = subscriberName;
+    }
+
+}