Merge "Correct the http client auth issue" into casablanca

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 926e09c..42e9cb6 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -321,12 +321,12 @@
                <dependency>
                        <groupId>org.onap.sdc.sdc-tosca</groupId>
                        <artifactId>sdc-tosca</artifactId>
-                       <version>1.4.1</version>                        
+                       <version>1.4.4</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.jtosca</groupId>
                        <artifactId>jtosca</artifactId>
-                       <version>1.4.1</version>
+                       <version>1.4.4</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>

diff --git a/common/src/main/java/org/onap/so/client/HttpClient.java b/common/src/main/java/org/onap/so/client/HttpClient.java
index 9c4b573..b991e79 100644 (file)
--- a/common/src/main/java/org/onap/so/client/HttpClient.java
+++ b/common/src/main/java/org/onap/so/client/HttpClient.java
@@ -42,8 +42,6 @@ public class HttpClient extends RestClient {
 
        @Override
        protected void initializeHeaderMap(Map<String, String> headerMap) {
-               headerMap.put("Authorization", "Basic YnBlbDpwYXNzd29yZDEk");
-               headerMap.put("content-type", "application/json");
        }
 
        @Override

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
index 764d2b7..83fe051 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java
@@ -43,6 +43,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.openpojo.business.annotation.BusinessKey;
 
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 import uk.co.blackpepper.bowman.annotation.LinkedResource;
 
 @Entity
@@ -91,6 +93,7 @@ public class VnfResource implements Serializable {
        private Date created;
 
        @ManyToOne(fetch = FetchType.LAZY)
+       @NotFound(action = NotFoundAction.IGNORE)
        @JoinColumn(name = "HEAT_TEMPLATE_ARTIFACT_UUID")
        private HeatTemplate heatTemplates;
 

diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/data.service.ts b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/data.service.ts
index 7967390..2e8f423 100644 (file)
--- a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/data.service.ts
+++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/data.service.ts
@@ -30,6 +30,7 @@ import { environment } from '../environments/environment';
 import { HttpResponse } from '@angular/common/http';\r
 import { PII } from './model/processInstance.model';\r
 import { HttpErrorHandlerService } from './http-error-handler.service';\r
+import { ACTINST } from './model/activityInstance.model';\r
 \r
 \r
 @Injectable({\r
@@ -59,12 +60,12 @@ export class DataService {
   }\r
 \r
   // HTTP GET to return Activity instancs using ProcessInstanceID\r
-  getActivityInstance(processInstanceId) {\r
+  getActivityInstance(processInstanceId): Promise<ACTINST[]> {\r
     var url = environment.soMonitoringBackendURL + 'activity-instance/' + processInstanceId;\r
-    return this.http.get(url)\r
+    return this.http.get<ACTINST[]>(url)\r
       .pipe(\r
         catchError(this.httpErrorHandlerService.handleError("GET", url))\r
-      );\r
+      ).toPromise();\r
   }\r
 \r
   // HTTP GET to return Activity Instance using ProcessInstanceID\r

diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.ts b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.ts
index 4c19ba1..bb464a9 100644 (file)
--- a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.ts
+++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.ts
@@ -43,7 +43,6 @@ import { NgxSpinnerService } from 'ngx-spinner';
 })\r
 \r
 export class DetailsComponent implements OnInit {\r
-\r
   bpmnViewer: any;\r
 \r
   processInstanceID: string;\r
@@ -67,8 +66,8 @@ export class DetailsComponent implements OnInit {
   constructor(private route: ActivatedRoute, private data: DataService, private popup: ToastrNotificationService,\r
     private router: Router, private spinner: NgxSpinnerService) { }\r
 \r
-  getActInst(procInstId: string) {\r
-    this.data.getActivityInstance(procInstId).subscribe(\r
+  async getActInst(procInstId: string) {\r
+    await this.data.getActivityInstance(procInstId).then(\r
       (data: ACTINST[]) => {\r
         this.activityInstance = data;\r
         console.log(data);\r
@@ -90,7 +89,7 @@ export class DetailsComponent implements OnInit {
       });\r
   }\r
 \r
-  async  getProcInstance(procInstId) {\r
+  async getProcInstance(procInstId) {\r
     await this.data.getProcessInstance(procInstId).then(\r
       async (data: PII) => {\r
         this.processInstance = data;\r
@@ -160,4 +159,5 @@ export class DetailsComponent implements OnInit {
         this.getVarInst(this.processInstanceID);\r
       });\r
   }\r
+\r
 }\r