Issue with the service loading and correct the license info

Issue-ID: USECASEUI-387

Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Change-Id: If4ed5a39941cb25ead173e92c145287fb280d477

46 files changed, 74 insertions, 79 deletions

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/RelationshipDatum.java b/server/src/main/java/org/onap/usecaseui/server/bean/RelationshipDatum.java
index 28197c46..45aed284 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/RelationshipDatum.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/RelationshipDatum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ComplexObj.java b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ComplexObj.java
index a0f8445b..28be3ab5 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ComplexObj.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ComplexObj.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipDatum.java b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipDatum.java
index cad2f861..13cc7553 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipDatum.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipDatum.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipList.java b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipList.java
index 7e8381f3..397856fa 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipList.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/RelationshipList.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ServiceInstance.java b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ServiceInstance.java
index bb636752..19fbabfc 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ServiceInstance.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/ServiceInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/SiteResource.java b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/SiteResource.java
index 60150d50..d8437b68 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/SiteResource.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/activateEdge/SiteResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstance.java b/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstance.java
index f955e755..79e51702 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstance.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstances.java b/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstances.java
index 489d692a..433a5921 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstances.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/customer/ServiceInstances.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/customer/Subscription.java b/server/src/main/java/org/onap/usecaseui/server/bean/customer/Subscription.java
index 99dda023..520d2d37 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/customer/Subscription.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/customer/Subscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ *Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/customer/SubscriptionType.java b/server/src/main/java/org/onap/usecaseui/server/bean/customer/SubscriptionType.java
index 47237145..9b99a00a 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/customer/SubscriptionType.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/customer/SubscriptionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java
index 74e0931a..f6ed3ed9 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Connectivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EParameters.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EParameters.java
index bcaffc9e..9204e06e 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EParameters.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EParameters.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
index 58a00c76..4b0b98cb 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDelete.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDelete.java
index 7e28db5f..5d6b8e84 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDelete.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceDelete.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import java.util.HashMap;
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
index 17df8892..d4642fe1 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/E2EServiceInstanceRequest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java
index d7ac2ee6..246cd746 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Edge.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileBean.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileBean.java
index 63fd3d88..78935f6c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileBean.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 public class FileBean {
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapper.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapper.java
index d2f08cc5..9077d7dd 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapper.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/FileWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
-
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 public class FileWrapper {
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLink.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLink.java
index dd9f86e1..422c5555 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLink.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/LogicalLink.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Model.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Model.java
index 9ac88dd9..7609b1a8 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Model.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Model.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java
index 61b117fc..1bb842ed 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java
index d5daaadd..f1af2f3c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ModelInfor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java
index a70cf954..84e083c1 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Node.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java
index 23889fc3..2ce79455 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pinterface.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pnf.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pnf.java
index 070d8883..ac714605 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pnf.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/Pnf.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
index 42884f56..9ecc2904 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceRequest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.onap.usecaseui.server.bean.lcm.sotne2eservice;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponse.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponse.java
index b4ab61a3..33238227 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponse.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/ResourceResponse.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java
index 32de1dc1..20424dd3 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnBinding.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformation.java
index b8f1676e..270c0c3b 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformation.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/VpnInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java
index 0e722621..cc74ec80 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservice/resourcemodelinformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ResponseServiceInstanceWrapper.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ResponseServiceInstanceWrapper.java
index 6d556218..09bbcf6e 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ResponseServiceInstanceWrapper.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ResponseServiceInstanceWrapper.java
@@ -1,6 +1,6 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
- *
+ * Copyright (C) 2020 Huawei, Inc. and others. 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
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceList.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceList.java
index 00148fbd..18fe027c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceList.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceList.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright (C) 2020 Huawei, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceListWrapper.java b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceListWrapper.java
index 57867bf7..89378d40 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceListWrapper.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/lcm/sotne2eservicemonitor/ServiceInstanceListWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/ServiceEstimationBean.java b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/ServiceEstimationBean.java
index c5ab000c..7f09a269 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/ServiceEstimationBean.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/ServiceEstimationBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ *Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/Site.java b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/Site.java
index a390790d..7c782f5e 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/Site.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/Site.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/VpnInformation.java b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/VpnInformation.java
index b2afa94b..1bc1e2e6 100644
--- a/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/VpnInformation.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/orderservice/VpnInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
diff --git a/server/src/main/java/org/onap/usecaseui/server/constant/Constant.java b/server/src/main/java/org/onap/usecaseui/server/constant/Constant.java
index f1babd68..2be1dc62 100644
--- a/server/src/main/java/org/onap/usecaseui/server/constant/Constant.java
+++ b/server/src/main/java/org/onap/usecaseui/server/constant/Constant.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.

+ * Copyright 2020 Huawei Corporation.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java
index f31947bc..31446226 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceLcmController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
index 0100d216..4058281f 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/SotnServiceQryController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/customer/CcvpnCustomerService.java b/server/src/main/java/org/onap/usecaseui/server/service/customer/CcvpnCustomerService.java
index 6758a722..ca1e9f7c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/customer/CcvpnCustomerService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/customer/CcvpnCustomerService.java
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
index 3e39c0a4..ae9f9bc1 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/customer/impl/CcvpnCustomerServiceImpl.java
@@ -1,6 +1,5 @@
-
-/*
- * Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+/**
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceQryService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceQryService.java
index ad1dd36b..92465785 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceQryService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceQryService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java
index 355939fb..c57f9542 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/SotnServiceTemplateService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
index cdc5dd11..fdf622bc 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/AAIService.java
@@ -1,5 +1,6 @@
 /**
  * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
index d417e7e1..dd9a2416 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
@@ -1,5 +1,6 @@
 /**
  * Copyright 2016-2017 ZTE Corporation.
+ * Copyright 2020 Huawei Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java
index 226330df..1179314c 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceTemplateServiceImpl.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright (C) 2020 Huawei, Inc. and others. 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.
+ */
+ 
 package org.onap.usecaseui.server.service.lcm.impl;
 
 
@@ -31,24 +47,12 @@ import org.json.simple.parser.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * 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.
- */
-
-
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
 
+@Service("SotnLcmService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
 public class SotnServiceTemplateServiceImpl implements SotnServiceTemplateService {
 
     private SOService soService;