32 files changed, 2241 insertions, 2241 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;
+    }
+
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java
index 119c29121..7c50ea097 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java
@@ -1,78 +1,78 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.time.LocalDateTime;
-
-import org.junit.Test;
-
-public class TestSoAsyncRequestStatus {
-
-    @Test
-    public void testConstructor() {
-        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
-
-        assertTrue(obj.getCorrelator() == null);
-        assertTrue(obj.getFinishTime() == null);
-        assertTrue(obj.getInstanceReferences() == null);
-        assertTrue(obj.getRequestId() == null);
-        assertTrue(obj.getRequestScope() == null);
-        assertTrue(obj.getRequestStatus() == null);
-        assertTrue(obj.getStartTime() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
-
-        obj.setCorrelator("correlator");
-        assertEquals("correlator", obj.getCorrelator());
-
-        LocalDateTime finishTime = LocalDateTime.now();
-        obj.setFinishTime(finishTime);
-        assertEquals(finishTime, obj.getFinishTime());
-
-        SOInstanceReferences instanceReferences = new SOInstanceReferences();
-        obj.setInstanceReferences(instanceReferences);
-        assertEquals(instanceReferences, obj.getInstanceReferences());
-
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-
-        obj.setRequestScope("requestScope");
-        assertEquals("requestScope", obj.getRequestScope());
-
-        SORequestStatus requestStatus = new SORequestStatus();
-        obj.setRequestStatus(requestStatus);
-        assertEquals(requestStatus, obj.getRequestStatus());
-
-        obj.setRequestType("requestType");
-        assertEquals("requestType", obj.getRequestType());
-
-        LocalDateTime startTime = LocalDateTime.now();
-        obj.setStartTime(startTime);
-        assertEquals(startTime, obj.getStartTime());
-
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+
+import org.junit.Test;
+
+public class TestSoAsyncRequestStatus {
+
+    @Test
+    public void testConstructor() {
+        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+
+        assertTrue(obj.getCorrelator() == null);
+        assertTrue(obj.getFinishTime() == null);
+        assertTrue(obj.getInstanceReferences() == null);
+        assertTrue(obj.getRequestId() == null);
+        assertTrue(obj.getRequestScope() == null);
+        assertTrue(obj.getRequestStatus() == null);
+        assertTrue(obj.getStartTime() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+
+        obj.setCorrelator("correlator");
+        assertEquals("correlator", obj.getCorrelator());
+
+        LocalDateTime finishTime = LocalDateTime.now();
+        obj.setFinishTime(finishTime);
+        assertEquals(finishTime, obj.getFinishTime());
+
+        SOInstanceReferences instanceReferences = new SOInstanceReferences();
+        obj.setInstanceReferences(instanceReferences);
+        assertEquals(instanceReferences, obj.getInstanceReferences());
+
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+
+        obj.setRequestScope("requestScope");
+        assertEquals("requestScope", obj.getRequestScope());
+
+        SORequestStatus requestStatus = new SORequestStatus();
+        obj.setRequestStatus(requestStatus);
+        assertEquals(requestStatus, obj.getRequestStatus());
+
+        obj.setRequestType("requestType");
+        assertEquals("requestType", obj.getRequestType());
+
+        LocalDateTime startTime = LocalDateTime.now();
+        obj.setStartTime(startTime);
+        assertEquals(startTime, obj.getStartTime());
+
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java
index f05912985..bab8970bb 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java
@@ -1,48 +1,48 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoCloudConfiguration {
-
-    @Test
-    public void testConstructor() {
-        SOCloudConfiguration obj = new SOCloudConfiguration();
-
-        assertTrue(obj.getLcpCloudRegionId() == null);
-        assertTrue(obj.getTenantId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOCloudConfiguration obj = new SOCloudConfiguration();
-
-        obj.setLcpCloudRegionId("lcpCloudRegionId");
-        assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());
-
-        obj.setTenantId("tenantId");
-        assertEquals("tenantId", obj.getTenantId());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoCloudConfiguration {
+
+    @Test
+    public void testConstructor() {
+        SOCloudConfiguration obj = new SOCloudConfiguration();
+
+        assertTrue(obj.getLcpCloudRegionId() == null);
+        assertTrue(obj.getTenantId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOCloudConfiguration obj = new SOCloudConfiguration();
+
+        obj.setLcpCloudRegionId("lcpCloudRegionId");
+        assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());
+
+        obj.setTenantId("tenantId");
+        assertEquals("tenantId", obj.getTenantId());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java
index 8c63e9c65..ee083ae08 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java
@@ -1,48 +1,48 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoInstanceReferences {
-
-    @Test
-    public void testConstructor() {
-        SOInstanceReferences obj = new SOInstanceReferences();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getRequestId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOInstanceReferences obj = new SOInstanceReferences();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoInstanceReferences {
+
+    @Test
+    public void testConstructor() {
+        SOInstanceReferences obj = new SOInstanceReferences();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getRequestId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOInstanceReferences obj = new SOInstanceReferences();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java
index 99f829fc7..037e82e4c 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java
@@ -1,69 +1,69 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoModelInfo {
-
-    @Test
-    public void testConstructor() {
-        SOModelInfo obj = new SOModelInfo();
-
-        assertTrue(obj.getModelCustomizationId() == null);
-        assertTrue(obj.getModelCustomizationName() == null);
-        assertTrue(obj.getModelInvariantId() == null);
-        assertTrue(obj.getModelName() == null);
-        assertTrue(obj.getModelType() == null);
-        assertTrue(obj.getModelVersion() == null);
-        assertTrue(obj.getModelVersionId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOModelInfo obj = new SOModelInfo();
-
-        obj.setModelCustomizationId("modelCustomizationId");
-        assertEquals("modelCustomizationId", obj.getModelCustomizationId());
-
-        obj.setModelCustomizationName("modelCustomizationName");
-        assertEquals("modelCustomizationName", obj.getModelCustomizationName());
-
-        obj.setModelInvariantId("modelInvariantId");
-        assertEquals("modelInvariantId", obj.getModelInvariantId());
-
-        obj.setModelName("modelName");
-        assertEquals("modelName", obj.getModelName());
-
-        obj.setModelType("modelType");
-        assertEquals("modelType", obj.getModelType());
-
-        obj.setModelVersion("modelVersion");
-        assertEquals("modelVersion", obj.getModelVersion());
-
-        obj.setModelVersionId("modelVersionId");
-        assertEquals("modelVersionId", obj.getModelVersionId());
-
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoModelInfo {
+
+    @Test
+    public void testConstructor() {
+        SOModelInfo obj = new SOModelInfo();
+
+        assertTrue(obj.getModelCustomizationId() == null);
+        assertTrue(obj.getModelCustomizationName() == null);
+        assertTrue(obj.getModelInvariantId() == null);
+        assertTrue(obj.getModelName() == null);
+        assertTrue(obj.getModelType() == null);
+        assertTrue(obj.getModelVersion() == null);
+        assertTrue(obj.getModelVersionId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOModelInfo obj = new SOModelInfo();
+
+        obj.setModelCustomizationId("modelCustomizationId");
+        assertEquals("modelCustomizationId", obj.getModelCustomizationId());
+
+        obj.setModelCustomizationName("modelCustomizationName");
+        assertEquals("modelCustomizationName", obj.getModelCustomizationName());
+
+        obj.setModelInvariantId("modelInvariantId");
+        assertEquals("modelInvariantId", obj.getModelInvariantId());
+
+        obj.setModelName("modelName");
+        assertEquals("modelName", obj.getModelName());
+
+        obj.setModelType("modelType");
+        assertEquals("modelType", obj.getModelType());
+
+        obj.setModelVersion("modelVersion");
+        assertEquals("modelVersion", obj.getModelVersion());
+
+        obj.setModelVersionId("modelVersionId");
+        assertEquals("modelVersionId", obj.getModelVersionId());
+
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java
index 978ec8a59..1c619a8c6 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java
@@ -1,48 +1,48 @@
-/*-
- * ============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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoPolicyExceptionHolder {
-
-    @Test
-    public void testConstructor() {
-        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
-
-        assertTrue(obj.getMessageId() == null);
-        assertTrue(obj.getText() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
-
-        obj.setMessageId("messageId");
-        assertEquals("messageId", obj.getMessageId());
-
-        obj.setText("text");
-        assertEquals("text", obj.getText());
-    }
-}
+/*-
+ * ============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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoPolicyExceptionHolder {
+
+    @Test
+    public void testConstructor() {
+        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+
+        assertTrue(obj.getMessageId() == null);
+        assertTrue(obj.getText() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+
+        obj.setMessageId("messageId");
+        assertEquals("messageId", obj.getMessageId());
+
+        obj.setText("text");
+        assertEquals("text", obj.getText());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java
index a8e94b8e2..048288377 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRelatedInstance {
-
-    @Test
-    public void testConstructor() {
-        SORelatedInstance obj = new SORelatedInstance();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getInstanceName() == null);
-        assertTrue(obj.getModelInfo() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORelatedInstance obj = new SORelatedInstance();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-
-        obj.setInstanceName("instanceName");
-        assertEquals("instanceName", obj.getInstanceName());
-
-        SOModelInfo modelInfo = new SOModelInfo();
-        obj.setModelInfo(modelInfo);
-        assertEquals(modelInfo, obj.getModelInfo());
-    }
-}
+/*-
+ * ============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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRelatedInstance {
+
+    @Test
+    public void testConstructor() {
+        SORelatedInstance obj = new SORelatedInstance();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getInstanceName() == null);
+        assertTrue(obj.getModelInfo() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORelatedInstance obj = new SORelatedInstance();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+
+        obj.setInstanceName("instanceName");
+        assertEquals("instanceName", obj.getInstanceName());
+
+        SOModelInfo modelInfo = new SOModelInfo();
+        obj.setModelInfo(modelInfo);
+        assertEquals(modelInfo, obj.getModelInfo());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java
index 17abd06e3..83f1d5849 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java
@@ -1,45 +1,45 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRelatedInstanceListElement {
-
-    @Test
-    public void testConstructor() {
-        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
-
-        assertTrue(obj.getRelatedInstance() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
-
-        SORelatedInstance relatedInstance = new SORelatedInstance();
-        obj.setRelatedInstance(relatedInstance);
-        assertEquals(relatedInstance, obj.getRelatedInstance());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRelatedInstanceListElement {
+
+    @Test
+    public void testConstructor() {
+        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+
+        assertTrue(obj.getRelatedInstance() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+
+        SORelatedInstance relatedInstance = new SORelatedInstance();
+        obj.setRelatedInstance(relatedInstance);
+        assertEquals(relatedInstance, obj.getRelatedInstance());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java
index 229765a72..f58254184 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java
@@ -1,72 +1,72 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.time.LocalDateTime;
-import java.util.UUID;
-
-import org.junit.Test;
-
-public class TestSoRequest {
-
-    @Test
-    public void testConstructor() {
-        SORequest obj = new SORequest();
-
-        assertTrue(obj.getFinishTime() == null);
-        assertTrue(obj.getRequestDetails() == null);
-        assertTrue(obj.getRequestId() == null);
-        assertTrue(obj.getRequestScope() == null);
-        assertTrue(obj.getRequestStatus() == null);
-        assertTrue(obj.getRequestType() == null);
-        assertTrue(obj.getStartTime() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequest obj = new SORequest();
-
-        LocalDateTime finishTime = LocalDateTime.now();
-        obj.setFinishTime(finishTime);
-        assertEquals(finishTime, obj.getFinishTime());
-
-        UUID uuid = UUID.randomUUID();
-        obj.setRequestId(uuid);
-        assertEquals(uuid, obj.getRequestId());
-
-        obj.setRequestScope("requestScope");
-        assertEquals("requestScope", obj.getRequestScope());
-
-        SORequestStatus requestStatus = new SORequestStatus();
-        obj.setRequestStatus(requestStatus);
-        assertEquals(requestStatus, obj.getRequestStatus());
-
-        obj.setRequestType("requestType");
-        assertEquals("requestType", obj.getRequestType());
-
-        LocalDateTime startTime = LocalDateTime.now();
-        obj.setStartTime(startTime.toString());
-        assertEquals(startTime.toString(), obj.getStartTime());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestSoRequest {
+
+    @Test
+    public void testConstructor() {
+        SORequest obj = new SORequest();
+
+        assertTrue(obj.getFinishTime() == null);
+        assertTrue(obj.getRequestDetails() == null);
+        assertTrue(obj.getRequestId() == null);
+        assertTrue(obj.getRequestScope() == null);
+        assertTrue(obj.getRequestStatus() == null);
+        assertTrue(obj.getRequestType() == null);
+        assertTrue(obj.getStartTime() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequest obj = new SORequest();
+
+        LocalDateTime finishTime = LocalDateTime.now();
+        obj.setFinishTime(finishTime);
+        assertEquals(finishTime, obj.getFinishTime());
+
+        UUID uuid = UUID.randomUUID();
+        obj.setRequestId(uuid);
+        assertEquals(uuid, obj.getRequestId());
+
+        obj.setRequestScope("requestScope");
+        assertEquals("requestScope", obj.getRequestScope());
+
+        SORequestStatus requestStatus = new SORequestStatus();
+        obj.setRequestStatus(requestStatus);
+        assertEquals(requestStatus, obj.getRequestStatus());
+
+        obj.setRequestType("requestType");
+        assertEquals("requestType", obj.getRequestType());
+
+        LocalDateTime startTime = LocalDateTime.now();
+        obj.setStartTime(startTime.toString());
+        assertEquals(startTime.toString(), obj.getStartTime());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java
index 42dfe0805..6e9a2bade 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java
@@ -1,174 +1,174 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-public class TestSoRequestDetails {
-
-    @Test
-    public void testConstructor() {
-        SORequestDetails obj = new SORequestDetails();
-
-        assertTrue(obj.getCloudConfiguration() == null);
-        assertTrue(obj.getModelInfo() == null);
-        assertTrue(obj.getRequestInfo() == null);
-        assertTrue(obj.getRequestParameters() == null);
-        assertTrue(obj.getSubscriberInfo() == null);
-
-        assertTrue(obj.getRelatedInstanceList() != null);
-        assertEquals(0, obj.getRelatedInstanceList().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestDetails obj = new SORequestDetails();
-
-        SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
-        obj.setCloudConfiguration(cloudConfiguration);
-        assertEquals(cloudConfiguration, obj.getCloudConfiguration());
-
-        SOModelInfo modelInfo = new SOModelInfo();
-        obj.setModelInfo(modelInfo);
-        assertEquals(modelInfo, obj.getModelInfo());
-
-        SORequestInfo requestInfo = new SORequestInfo();
-        obj.setRequestInfo(requestInfo);
-        assertEquals(requestInfo, obj.getRequestInfo());
-
-        SORequestParameters requestParameters = new SORequestParameters();
-        obj.setRequestParameters(requestParameters);
-        assertEquals(requestParameters, obj.getRequestParameters());
-
-        SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
-        obj.setSubscriberInfo(subscriberInfo);
-        assertEquals(subscriberInfo, obj.getSubscriberInfo());
-    }
-    
-	@Test
-	public void testSOMRequestDetailsMethods() {
-		SORequestDetails details = new SORequestDetails();
-		assertNotNull(details);
-		assertNotEquals(0, details.hashCode());
-		
-		SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
-		details.setCloudConfiguration(cloudConfiguration);
-		assertEquals(cloudConfiguration, details.getCloudConfiguration());
-		assertNotEquals(0, details.hashCode());
-		
-		SOModelInfo modelInfo = new SOModelInfo();
-		details.setModelInfo(modelInfo);
-		assertEquals(modelInfo, details.getModelInfo());
-		assertNotEquals(0, details.hashCode());
-		
-		List<SORelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
-		details.setRelatedInstanceList(relatedInstanceList);
-		assertEquals(relatedInstanceList, details.getRelatedInstanceList());
-		assertNotEquals(0, details.hashCode());
-		
-		SORequestInfo requestInfo = new SORequestInfo();
-		details.setRequestInfo(requestInfo);
-		assertEquals(requestInfo, details.getRequestInfo());
-		assertNotEquals(0, details.hashCode());
-		
-		SORequestParameters requestParameters = new SORequestParameters();
-		details.setRequestParameters(requestParameters);
-		assertEquals(requestParameters, details.getRequestParameters());
-		assertNotEquals(0, details.hashCode());
-		
-		SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
-		details.setSubscriberInfo(subscriberInfo);
-		assertEquals(subscriberInfo, details.getSubscriberInfo());
-		assertNotEquals(0, details.hashCode());
-		
-		assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0,  46));
-		
-		SORequestDetails copiedDetails = new SORequestDetails(details);
-
-        assertTrue(details.equals(details));
-        assertTrue(details.equals(copiedDetails));
-        assertFalse(details.equals(null));
-        assertFalse(details.equals("Hello"));
-        
-        details.setCloudConfiguration(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setCloudConfiguration(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setCloudConfiguration(cloudConfiguration);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setCloudConfiguration(cloudConfiguration);
-        assertTrue(details.equals(copiedDetails));
-
-        details.setModelInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setModelInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setModelInfo(modelInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setModelInfo(modelInfo);
-        assertTrue(details.equals(copiedDetails));
-        
-        details.setRequestInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRequestInfo(requestInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestInfo(requestInfo);
-        assertTrue(details.equals(copiedDetails));
-		
-        details.setRequestParameters(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestParameters(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRequestParameters(requestParameters);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setRequestParameters(requestParameters);
-        assertTrue(details.equals(copiedDetails));
-		
-        details.setSubscriberInfo(null);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setSubscriberInfo(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setSubscriberInfo(subscriberInfo);
-        assertFalse(details.equals(copiedDetails));
-        copiedDetails.setSubscriberInfo(subscriberInfo);
-        assertTrue(details.equals(copiedDetails));
-		
-        details.setRelatedInstanceList(null);
-        assertFalse(details.equals(copiedDetails));
-		copiedDetails.setRelatedInstanceList(null);
-        assertTrue(details.equals(copiedDetails));
-        details.setRelatedInstanceList(relatedInstanceList);
-        assertFalse(details.equals(copiedDetails));
-		copiedDetails.setRelatedInstanceList(relatedInstanceList);
-        assertTrue(details.equals(copiedDetails));
-	}
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class TestSoRequestDetails {
+
+    @Test
+    public void testConstructor() {
+        SORequestDetails obj = new SORequestDetails();
+
+        assertTrue(obj.getCloudConfiguration() == null);
+        assertTrue(obj.getModelInfo() == null);
+        assertTrue(obj.getRequestInfo() == null);
+        assertTrue(obj.getRequestParameters() == null);
+        assertTrue(obj.getSubscriberInfo() == null);
+
+        assertTrue(obj.getRelatedInstanceList() != null);
+        assertEquals(0, obj.getRelatedInstanceList().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestDetails obj = new SORequestDetails();
+
+        SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+        obj.setCloudConfiguration(cloudConfiguration);
+        assertEquals(cloudConfiguration, obj.getCloudConfiguration());
+
+        SOModelInfo modelInfo = new SOModelInfo();
+        obj.setModelInfo(modelInfo);
+        assertEquals(modelInfo, obj.getModelInfo());
+
+        SORequestInfo requestInfo = new SORequestInfo();
+        obj.setRequestInfo(requestInfo);
+        assertEquals(requestInfo, obj.getRequestInfo());
+
+        SORequestParameters requestParameters = new SORequestParameters();
+        obj.setRequestParameters(requestParameters);
+        assertEquals(requestParameters, obj.getRequestParameters());
+
+        SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+        obj.setSubscriberInfo(subscriberInfo);
+        assertEquals(subscriberInfo, obj.getSubscriberInfo());
+    }
+    
+	@Test
+	public void testSOMRequestDetailsMethods() {
+		SORequestDetails details = new SORequestDetails();
+		assertNotNull(details);
+		assertNotEquals(0, details.hashCode());
+		
+		SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+		details.setCloudConfiguration(cloudConfiguration);
+		assertEquals(cloudConfiguration, details.getCloudConfiguration());
+		assertNotEquals(0, details.hashCode());
+		
+		SOModelInfo modelInfo = new SOModelInfo();
+		details.setModelInfo(modelInfo);
+		assertEquals(modelInfo, details.getModelInfo());
+		assertNotEquals(0, details.hashCode());
+		
+		List<SORelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
+		details.setRelatedInstanceList(relatedInstanceList);
+		assertEquals(relatedInstanceList, details.getRelatedInstanceList());
+		assertNotEquals(0, details.hashCode());
+		
+		SORequestInfo requestInfo = new SORequestInfo();
+		details.setRequestInfo(requestInfo);
+		assertEquals(requestInfo, details.getRequestInfo());
+		assertNotEquals(0, details.hashCode());
+		
+		SORequestParameters requestParameters = new SORequestParameters();
+		details.setRequestParameters(requestParameters);
+		assertEquals(requestParameters, details.getRequestParameters());
+		assertNotEquals(0, details.hashCode());
+		
+		SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+		details.setSubscriberInfo(subscriberInfo);
+		assertEquals(subscriberInfo, details.getSubscriberInfo());
+		assertNotEquals(0, details.hashCode());
+		
+		assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0,  46));
+		
+		SORequestDetails copiedDetails = new SORequestDetails(details);
+
+        assertTrue(details.equals(details));
+        assertTrue(details.equals(copiedDetails));
+        assertFalse(details.equals(null));
+        assertFalse(details.equals("Hello"));
+        
+        details.setCloudConfiguration(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setCloudConfiguration(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setCloudConfiguration(cloudConfiguration);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setCloudConfiguration(cloudConfiguration);
+        assertTrue(details.equals(copiedDetails));
+
+        details.setModelInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setModelInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setModelInfo(modelInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setModelInfo(modelInfo);
+        assertTrue(details.equals(copiedDetails));
+        
+        details.setRequestInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRequestInfo(requestInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestInfo(requestInfo);
+        assertTrue(details.equals(copiedDetails));
+		
+        details.setRequestParameters(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestParameters(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRequestParameters(requestParameters);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestParameters(requestParameters);
+        assertTrue(details.equals(copiedDetails));
+		
+        details.setSubscriberInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setSubscriberInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setSubscriberInfo(subscriberInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setSubscriberInfo(subscriberInfo);
+        assertTrue(details.equals(copiedDetails));
+		
+        details.setRelatedInstanceList(null);
+        assertFalse(details.equals(copiedDetails));
+		copiedDetails.setRelatedInstanceList(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRelatedInstanceList(relatedInstanceList);
+        assertFalse(details.equals(copiedDetails));
+		copiedDetails.setRelatedInstanceList(relatedInstanceList);
+        assertTrue(details.equals(copiedDetails));
+	}
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java
index 1108daf3d..a3c19cf41 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java
@@ -1,50 +1,50 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRequestError {
-
-    @Test
-    public void testConstructor() {
-        SORequestError obj = new SORequestError();
-
-        assertTrue(obj.getPolicyException() == null);
-        assertTrue(obj.getServiceException() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestError obj = new SORequestError();
-
-        SOPolicyExceptionHolder policyException = new SOPolicyExceptionHolder();
-        obj.setPolicyException(policyException);
-        assertEquals(policyException, obj.getPolicyException());
-
-        SOServiceExceptionHolder serviceException = new SOServiceExceptionHolder();
-        obj.setServiceException(serviceException);
-        assertEquals(serviceException, obj.getServiceException());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestError {
+
+    @Test
+    public void testConstructor() {
+        SORequestError obj = new SORequestError();
+
+        assertTrue(obj.getPolicyException() == null);
+        assertTrue(obj.getServiceException() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestError obj = new SORequestError();
+
+        SOPolicyExceptionHolder policyException = new SOPolicyExceptionHolder();
+        obj.setPolicyException(policyException);
+        assertEquals(policyException, obj.getPolicyException());
+
+        SOServiceExceptionHolder serviceException = new SOServiceExceptionHolder();
+        obj.setServiceException(serviceException);
+        assertEquals(serviceException, obj.getServiceException());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java
index d1b7f247c..a77fe8bf4 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java
@@ -1,81 +1,81 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRequestInfo {
-
-    @Test
-    public void testConstructor() {
-        SORequestInfo obj = new SORequestInfo();
-
-        assertTrue(obj.getBillingAccountNumber() == null);
-        assertTrue(obj.getCallbackUrl() == null);
-        assertTrue(obj.getCorrelator() == null);
-        assertTrue(obj.getInstanceName() == null);
-        assertTrue(obj.getOrderNumber() == null);
-        assertTrue(obj.getOrderVersion() == null);
-        assertTrue(obj.getProductFamilyId() == null);
-        assertTrue(obj.getRequestorId() == null);
-        assertTrue(obj.getSource() == null);
-        assertTrue(obj.isSuppressRollback() == false);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestInfo obj = new SORequestInfo();
-
-        obj.setBillingAccountNumber("billingAccountNumber");
-        assertEquals("billingAccountNumber", obj.getBillingAccountNumber());
-
-        obj.setCallbackUrl("callbackUrl");
-        assertEquals("callbackUrl", obj.getCallbackUrl());
-
-        obj.setCorrelator("correlator");
-        assertEquals("correlator", obj.getCorrelator());
-
-        obj.setInstanceName("instanceName");
-        assertEquals("instanceName", obj.getInstanceName());
-
-        obj.setOrderNumber("orderNumber");
-        assertEquals("orderNumber", obj.getOrderNumber());
-
-        int orderVersion = 2008;
-        obj.setOrderVersion(orderVersion);
-        assertEquals((Integer) orderVersion, obj.getOrderVersion());
-
-        obj.setProductFamilyId("productFamilyId");
-        assertEquals("productFamilyId", obj.getProductFamilyId());
-
-        obj.setRequestorId("requestorId");
-        assertEquals("requestorId", obj.getRequestorId());
-
-        obj.setSource("source");
-        assertEquals("source", obj.getSource());
-
-        obj.setSuppressRollback(true);
-        assertEquals(true, obj.isSuppressRollback());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestInfo {
+
+    @Test
+    public void testConstructor() {
+        SORequestInfo obj = new SORequestInfo();
+
+        assertTrue(obj.getBillingAccountNumber() == null);
+        assertTrue(obj.getCallbackUrl() == null);
+        assertTrue(obj.getCorrelator() == null);
+        assertTrue(obj.getInstanceName() == null);
+        assertTrue(obj.getOrderNumber() == null);
+        assertTrue(obj.getOrderVersion() == null);
+        assertTrue(obj.getProductFamilyId() == null);
+        assertTrue(obj.getRequestorId() == null);
+        assertTrue(obj.getSource() == null);
+        assertTrue(obj.isSuppressRollback() == false);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestInfo obj = new SORequestInfo();
+
+        obj.setBillingAccountNumber("billingAccountNumber");
+        assertEquals("billingAccountNumber", obj.getBillingAccountNumber());
+
+        obj.setCallbackUrl("callbackUrl");
+        assertEquals("callbackUrl", obj.getCallbackUrl());
+
+        obj.setCorrelator("correlator");
+        assertEquals("correlator", obj.getCorrelator());
+
+        obj.setInstanceName("instanceName");
+        assertEquals("instanceName", obj.getInstanceName());
+
+        obj.setOrderNumber("orderNumber");
+        assertEquals("orderNumber", obj.getOrderNumber());
+
+        int orderVersion = 2008;
+        obj.setOrderVersion(orderVersion);
+        assertEquals((Integer) orderVersion, obj.getOrderVersion());
+
+        obj.setProductFamilyId("productFamilyId");
+        assertEquals("productFamilyId", obj.getProductFamilyId());
+
+        obj.setRequestorId("requestorId");
+        assertEquals("requestorId", obj.getRequestorId());
+
+        obj.setSource("source");
+        assertEquals("source", obj.getSource());
+
+        obj.setSuppressRollback(true);
+        assertEquals(true, obj.isSuppressRollback());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java
index cb32be531..1ebf5d76f 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java
@@ -1,46 +1,46 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRequestParameters {
-
-    @Test
-    public void testConstructor() {
-        SORequestParameters obj = new SORequestParameters();
-
-        assertTrue(obj.getSubscriptionServiceType() == null);
-        assertTrue(obj.getUserParams() != null);
-        assertEquals(0, obj.getUserParams().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestParameters obj = new SORequestParameters();
-
-        obj.setSubscriptionServiceType("subscriptionServiceType");
-        assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestParameters {
+
+    @Test
+    public void testConstructor() {
+        SORequestParameters obj = new SORequestParameters();
+
+        assertTrue(obj.getSubscriptionServiceType() == null);
+        assertTrue(obj.getUserParams() != null);
+        assertEquals(0, obj.getUserParams().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestParameters obj = new SORequestParameters();
+
+        obj.setSubscriptionServiceType("subscriptionServiceType");
+        assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java
index e212ba1c3..498a2e00b 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java
@@ -1,48 +1,48 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRequestReferences {
-
-    @Test
-    public void testConstructor() {
-        SORequestReferences obj = new SORequestReferences();
-
-        assertTrue(obj.getInstanceId() == null);
-        assertTrue(obj.getRequestId() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestReferences obj = new SORequestReferences();
-
-        obj.setInstanceId("instanceId");
-        assertEquals("instanceId", obj.getInstanceId());
-        
-        obj.setRequestId("requestId");
-        assertEquals("requestId", obj.getRequestId());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestReferences {
+
+    @Test
+    public void testConstructor() {
+        SORequestReferences obj = new SORequestReferences();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getRequestId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestReferences obj = new SORequestReferences();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+        
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java
index 9fa0b9741..1b8d745fd 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java
@@ -1,57 +1,57 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoRequestStatus {
-
-    @Test
-    public void testConstructor() {
-        SORequestStatus obj = new SORequestStatus();
-
-        assertEquals(0, obj.getPercentProgress());
-        assertTrue(obj.getRequestState() == null);
-        assertTrue(obj.getTimestamp() == null);
-        assertFalse(obj.isWasRolledBack());
-    }
-
-    @Test
-    public void testSetGet() {
-        SORequestStatus obj = new SORequestStatus();
-
-        obj.setPercentProgress(2008);
-        assertEquals(2008, obj.getPercentProgress());
-
-        obj.setRequestState("requestState");
-        assertEquals("requestState", obj.getRequestState());
-
-        obj.setTimestamp("timestamp");
-        assertEquals("timestamp", obj.getTimestamp());
-
-        obj.setWasRolledBack(true);
-        assertTrue(obj.isWasRolledBack());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestStatus {
+
+    @Test
+    public void testConstructor() {
+        SORequestStatus obj = new SORequestStatus();
+
+        assertEquals(0, obj.getPercentProgress());
+        assertTrue(obj.getRequestState() == null);
+        assertTrue(obj.getTimestamp() == null);
+        assertFalse(obj.isWasRolledBack());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestStatus obj = new SORequestStatus();
+
+        obj.setPercentProgress(2008);
+        assertEquals(2008, obj.getPercentProgress());
+
+        obj.setRequestState("requestState");
+        assertEquals("requestState", obj.getRequestState());
+
+        obj.setTimestamp("timestamp");
+        assertEquals("timestamp", obj.getTimestamp());
+
+        obj.setWasRolledBack(true);
+        assertTrue(obj.isWasRolledBack());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java
index edac2fa0d..cf9a85e83 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java
@@ -1,59 +1,59 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoResponse {
-
-    @Test
-    public void testConstructor() {
-        SOResponse obj = new SOResponse();
-
-        assertEquals(0, obj.getHttpResponseCode());
-        assertTrue(obj.getRequest() == null);
-        assertTrue(obj.getRequestError() == null);
-        assertTrue(obj.getRequestReferences() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOResponse obj = new SOResponse();
-
-        obj.setHttpResponseCode(2008);
-        assertEquals(2008, obj.getHttpResponseCode());
-
-        SORequest request = new SORequest();
-        obj.setRequest(request);
-        assertEquals(request, obj.getRequest());
-
-        SORequestError requestError = new SORequestError();
-        obj.setRequestError(requestError);
-        assertEquals(requestError, obj.getRequestError());
-
-        SORequestReferences requestReferences = new SORequestReferences();
-        obj.setRequestReferences(requestReferences);
-        assertEquals(requestReferences, obj.getRequestReferences());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoResponse {
+
+    @Test
+    public void testConstructor() {
+        SOResponse obj = new SOResponse();
+
+        assertEquals(0, obj.getHttpResponseCode());
+        assertTrue(obj.getRequest() == null);
+        assertTrue(obj.getRequestError() == null);
+        assertTrue(obj.getRequestReferences() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOResponse obj = new SOResponse();
+
+        obj.setHttpResponseCode(2008);
+        assertEquals(2008, obj.getHttpResponseCode());
+
+        SORequest request = new SORequest();
+        obj.setRequest(request);
+        assertEquals(request, obj.getRequest());
+
+        SORequestError requestError = new SORequestError();
+        obj.setRequestError(requestError);
+        assertEquals(requestError, obj.getRequestError());
+
+        SORequestReferences requestReferences = new SORequestReferences();
+        obj.setRequestReferences(requestReferences);
+        assertEquals(requestReferences, obj.getRequestReferences());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java
index 7b4830125..860761a39 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java
@@ -1,106 +1,106 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.UUID;
-
-import org.junit.Test;
-
-public class TestSoResponseWrapper {
-
-    @Test
-    public void testConstructor() {
-        SOResponse response = new SOResponse();
-        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
-
-        assertEquals(response, obj.getSoResponse());
-        assertEquals("reqID", obj.getRequestID());
-    }
-
-    @Test
-    public void testSetGet() {
-        SOResponse response = new SOResponse();
-        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
-
-        SOResponse response2 = new SOResponse();
-        response2.setHttpResponseCode(2008);
-        obj.setSoResponse(response2);
-        assertEquals(response2, obj.getSoResponse());
-
-        obj.setRequestID("id2");
-        assertEquals("id2", obj.getRequestID());
-    }
-    
-	@SuppressWarnings("unlikely-arg-type")
-	@Test
-	public void testSOResponseWrapperMethods() {
-		String requestID = UUID.randomUUID().toString();
-		SOResponse response = new SOResponse();
-
-		SOResponseWrapper responseWrapper = new SOResponseWrapper(response, requestID);
-		assertNotNull(responseWrapper);
-		assertNotEquals(0, responseWrapper.hashCode());
-		
-		assertEquals(response, responseWrapper.getSoResponse());
-		
-		assertNotEquals(0, responseWrapper.hashCode());
-		
-		assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0,  46));
-		
-		SOResponseWrapper identicalResponseWrapper = new SOResponseWrapper(response, requestID);
-
-        assertEquals(responseWrapper,  responseWrapper);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        assertNotEquals(null, responseWrapper);
-        assertNotEquals("Hello", responseWrapper);
-        assertFalse(responseWrapper.equals(null));
-        assertFalse(responseWrapper.equals("AString"));
-        
-        assertEquals(new SOResponseWrapper(null, null), new SOResponseWrapper(null, null));
-        assertNotEquals(new SOResponseWrapper(null, null), identicalResponseWrapper);
-        
-		assertNotEquals(0, new SOResponseWrapper(null, null).hashCode());
-
-		identicalResponseWrapper.setSoResponse(new SOResponse());
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setSoResponse(response);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        
-        identicalResponseWrapper.setRequestID(UUID.randomUUID().toString());
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestID(requestID);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        
-        responseWrapper.setRequestID(null);
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestID(null);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-        responseWrapper.setRequestID(requestID);
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);
-        identicalResponseWrapper.setRequestID(requestID);
-        assertEquals(responseWrapper,  identicalResponseWrapper);
-	}
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestSoResponseWrapper {
+
+    @Test
+    public void testConstructor() {
+        SOResponse response = new SOResponse();
+        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+
+        assertEquals(response, obj.getSoResponse());
+        assertEquals("reqID", obj.getRequestID());
+    }
+
+    @Test
+    public void testSetGet() {
+        SOResponse response = new SOResponse();
+        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+
+        SOResponse response2 = new SOResponse();
+        response2.setHttpResponseCode(2008);
+        obj.setSoResponse(response2);
+        assertEquals(response2, obj.getSoResponse());
+
+        obj.setRequestID("id2");
+        assertEquals("id2", obj.getRequestID());
+    }
+    
+	@SuppressWarnings("unlikely-arg-type")
+	@Test
+	public void testSOResponseWrapperMethods() {
+		String requestID = UUID.randomUUID().toString();
+		SOResponse response = new SOResponse();
+
+		SOResponseWrapper responseWrapper = new SOResponseWrapper(response, requestID);
+		assertNotNull(responseWrapper);
+		assertNotEquals(0, responseWrapper.hashCode());
+		
+		assertEquals(response, responseWrapper.getSoResponse());
+		
+		assertNotEquals(0, responseWrapper.hashCode());
+		
+		assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0,  46));
+		
+		SOResponseWrapper identicalResponseWrapper = new SOResponseWrapper(response, requestID);
+
+        assertEquals(responseWrapper,  responseWrapper);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        assertNotEquals(null, responseWrapper);
+        assertNotEquals("Hello", responseWrapper);
+        assertFalse(responseWrapper.equals(null));
+        assertFalse(responseWrapper.equals("AString"));
+        
+        assertEquals(new SOResponseWrapper(null, null), new SOResponseWrapper(null, null));
+        assertNotEquals(new SOResponseWrapper(null, null), identicalResponseWrapper);
+        
+		assertNotEquals(0, new SOResponseWrapper(null, null).hashCode());
+
+		identicalResponseWrapper.setSoResponse(new SOResponse());
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setSoResponse(response);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        
+        identicalResponseWrapper.setRequestID(UUID.randomUUID().toString());
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(requestID);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        
+        responseWrapper.setRequestID(null);
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(null);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        responseWrapper.setRequestID(requestID);
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(requestID);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+	}
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java
index 877ea7146..7c802efaf 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java
@@ -1,50 +1,50 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoServiceExceptionHolder {
-
-    @Test
-    public void testConstructor() {
-        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
-
-        assertTrue(obj.getMessageId() == null);
-        assertTrue(obj.getText() == null);
-        assertTrue(obj.getVariables() != null);
-        assertEquals(0, obj.getVariables().size());
-    }
-
-    @Test
-    public void testSetGet() {
-        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
-
-        obj.setMessageId("messageId");
-        assertEquals("messageId", obj.getMessageId());
-
-        obj.setText("text");
-        assertEquals("text", obj.getText());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoServiceExceptionHolder {
+
+    @Test
+    public void testConstructor() {
+        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+
+        assertTrue(obj.getMessageId() == null);
+        assertTrue(obj.getText() == null);
+        assertTrue(obj.getVariables() != null);
+        assertEquals(0, obj.getVariables().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+
+        obj.setMessageId("messageId");
+        assertEquals("messageId", obj.getMessageId());
+
+        obj.setText("text");
+        assertEquals("text", obj.getText());
+    }
+}
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java
index 0bff38c5c..b0662fa30 100755
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java
@@ -1,52 +1,52 @@
-/*-
- * ============LICENSE_START=======================================================
- * so
- * ================================================================================
- * 
- * ================================================================================
- * 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class TestSoSubscriberInfo {
-
-    @Test
-    public void testConstructor() {
-        SOSubscriberInfo obj = new SOSubscriberInfo();
-
-        assertTrue(obj.getGlobalSubscriberId() == null);
-        assertTrue(obj.getSubscriberCommonSiteId() == null);
-        assertTrue(obj.getSubscriberName() == null);
-    }
-
-    @Test
-    public void testSetGet() {
-        SOSubscriberInfo obj = new SOSubscriberInfo();
-
-        obj.setGlobalSubscriberId("globalSubscriberId");
-        assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());
-
-        obj.setSubscriberCommonSiteId("subscriberCommonSiteId");
-        assertEquals("subscriberCommonSiteId", obj.getSubscriberCommonSiteId());
-        
-        obj.setSubscriberName("subscriberName");
-        assertEquals("subscriberName", obj.getSubscriberName());
-    }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoSubscriberInfo {
+
+    @Test
+    public void testConstructor() {
+        SOSubscriberInfo obj = new SOSubscriberInfo();
+
+        assertTrue(obj.getGlobalSubscriberId() == null);
+        assertTrue(obj.getSubscriberCommonSiteId() == null);
+        assertTrue(obj.getSubscriberName() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOSubscriberInfo obj = new SOSubscriberInfo();
+
+        obj.setGlobalSubscriberId("globalSubscriberId");
+        assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());
+
+        obj.setSubscriberCommonSiteId("subscriberCommonSiteId");
+        assertEquals("subscriberCommonSiteId", obj.getSubscriberCommonSiteId());
+        
+        obj.setSubscriberName("subscriberName");
+        assertEquals("subscriberName", obj.getSubscriberName());
+    }
+}