Merge "refactor so-mon-ui code"

4 files changed, 15 insertions, 15 deletions

diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java
index 9ef54272ef..4278a26a69 100644
--- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java
+++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/db/service/DatabaseServiceProviderImpl.java
@@ -73,7 +73,7 @@ public class DatabaseServiceProviderImpl implements DatabaseServiceProvider {
                             .setServiceInstanceId(activeRequests.getServiceInstanceId())
                             .setNetworkId(activeRequests.getNetworkId()).setEndTime(activeRequests.getEndTime())
                             .setRequestStatus(activeRequests.getRequestStatus())
-                            .setServiceIstanceName(activeRequests.getServiceInstanceName())
+                            .setServiceInstanceName(activeRequests.getServiceInstanceName())
                             .setServiceType(activeRequests.getServiceType()).setStartTime(activeRequests.getStartTime())
                             .build();
             result.add(soInfraRequest);
diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java
index 06a08f2027..0f34664935 100644
--- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java
+++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/ProcessInstanceIdDetail.java
@@ -34,7 +34,7 @@ public class ProcessInstanceIdDetail {
     }
 
     /**
-     * @return the processInstancId
+     * @return the processInstanceId
      */
     public String getProcessInstanceId() {
         return processInstanceId;
diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java
index e16cd14598..53b928b88e 100644
--- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java
+++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequest.java
@@ -28,7 +28,7 @@ public class SoInfraRequest {
 
     private final String requestId;
     private final String serviceInstanceId;
-    private final String serviceIstanceName;
+    private final String serviceInstanceName;
     private final String networkId;
     private final String requestStatus;
     private final String serviceType;
@@ -38,7 +38,7 @@ public class SoInfraRequest {
     public SoInfraRequest(final SoInfraRequestBuilder requestBuilder) {
         this.requestId = requestBuilder.getRequestId();
         this.serviceInstanceId = requestBuilder.getServiceInstanceId();
-        this.serviceIstanceName = requestBuilder.getServiceIstanceName();
+        this.serviceInstanceName = requestBuilder.getServiceInstanceName();
         this.networkId = requestBuilder.getNetworkId();
         this.requestStatus = requestBuilder.getRequestStatus();
         this.serviceType = requestBuilder.getServiceType();
@@ -61,10 +61,10 @@ public class SoInfraRequest {
     }
 
     /**
-     * @return the serviceIstanceName
+     * @return the serviceInstanceName
      */
-    public String getServiceIstanceName() {
-        return serviceIstanceName;
+    public String getServiceInstanceName() {
+        return serviceInstanceName;
     }
 
     /**
@@ -111,7 +111,7 @@ public class SoInfraRequest {
         result = prime * result + ((requestId == null) ? 0 : requestId.hashCode());
         result = prime * result + ((requestStatus == null) ? 0 : requestStatus.hashCode());
         result = prime * result + ((serviceInstanceId == null) ? 0 : serviceInstanceId.hashCode());
-        result = prime * result + ((serviceIstanceName == null) ? 0 : serviceIstanceName.hashCode());
+        result = prime * result + ((serviceInstanceName == null) ? 0 : serviceInstanceName.hashCode());
         result = prime * result + ((serviceType == null) ? 0 : serviceType.hashCode());
         result = prime * result + ((startTime == null) ? 0 : startTime.hashCode());
         return result;
@@ -122,7 +122,7 @@ public class SoInfraRequest {
         if (obj instanceof SoInfraRequest) {
             final SoInfraRequest other = (SoInfraRequest) obj;
             return isEqual(requestId, other.requestId) && isEqual(serviceInstanceId, other.serviceInstanceId)
-                    && isEqual(serviceIstanceName, other.serviceIstanceName) && isEqual(networkId, other.networkId)
+                    && isEqual(serviceInstanceName, other.serviceInstanceName) && isEqual(networkId, other.networkId)
                     && isEqual(requestStatus, other.requestStatus) && isEqual(serviceType, other.serviceType)
                     && isEqual(startTime, other.startTime) && isEqual(endTime, other.endTime);
         }
diff --git a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java
index cdaf7641c8..235c481930 100644
--- a/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java
+++ b/so-monitoring/so-monitoring-handler/src/main/java/org/onap/so/monitoring/model/SoInfraRequestBuilder.java
@@ -28,7 +28,7 @@ public class SoInfraRequestBuilder {
 
     private String requestId;
     private String serviceInstanceId;
-    private String serviceIstanceName;
+    private String serviceInstanceName;
     private String networkId;
     private String requestStatus;
     private String serviceType;
@@ -45,8 +45,8 @@ public class SoInfraRequestBuilder {
         return this;
     }
 
-    public SoInfraRequestBuilder setServiceIstanceName(final String serviceIstanceName) {
-        this.serviceIstanceName = serviceIstanceName;
+    public SoInfraRequestBuilder setServiceInstanceName(final String serviceInstanceName) {
+        this.serviceInstanceName = serviceInstanceName;
         return this;
     }
 
@@ -105,10 +105,10 @@ public class SoInfraRequestBuilder {
     }
 
     /**
-     * @return the serviceIstanceName
+     * @return the serviceInstanceName
      */
-    public String getServiceIstanceName() {
-        return serviceIstanceName;
+    public String getServiceInstanceName() {
+        return serviceInstanceName;
     }
 
     /**