Merge changes from topics "VID-30", "VID-37"

* changes:
  Add the "@Override" annotation.
  Replace "==" with "===".

2 files changed, 2 insertions, 1 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java b/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java
index 8370f91e1..cb7a0fcc6 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java
@@ -41,6 +41,7 @@ public class VNFDao extends DomainVo {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "VNF_DB_ID")
     @JsonIgnore
+    @Override
     public Long getId() {
         return id;
     }
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index b3afcd864..6d8dde844 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -35,7 +35,7 @@
         $scope.properties = UtilityService.getProperties();

         $scope.resumeStatus = COMPONENT.RESUME_STATUS;

         //isPermitted - returned as string from url and converted into boolean

-        $scope.isPermitted = $location.search().isPermitted == "true";

+        $scope.isPermitted = $location.search().isPermitted === "true";

         $scope.STATUS_CONSTANTS = FIELD.STATUS;

         $scope.pnfs = [];// PNF data init;

         $scope.collectionResource = {};