Merge "Added the "@Override" annotation"

3 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java b/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
index f55d2e7..e889656 100644
--- a/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
+++ b/src/main/java/org/openecomp/datarouter/util/CrossEntityReference.java
@@ -38,7 +38,7 @@ public class CrossEntityReference {
 
   public CrossEntityReference() {
     this.targetEntityType = null;
-    this.attributeNames = new ArrayList<String>();
+    this.attributeNames = new ArrayList<>();
   }
 
   public String getTargetEntityType() {
diff --git a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java b/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
index 503a069..cd5a37d 100644
--- a/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
+++ b/src/main/java/org/openecomp/datarouter/util/EntityOxmReferenceHelper.java
@@ -33,7 +33,7 @@ public class EntityOxmReferenceHelper implements ExternalOxmModelProcessor {
    private HashMap<Version, VersionedOxmEntities> versionedModels;
    
    protected EntityOxmReferenceHelper() {
-      this.versionedModels = new HashMap<Version,VersionedOxmEntities>();
+      this.versionedModels = new HashMap<>();
    }
    
    public static EntityOxmReferenceHelper getInstance() {
@@ -57,4 +57,4 @@ public class EntityOxmReferenceHelper implements ExternalOxmModelProcessor {
       return this.versionedModels.get(version);
    }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java b/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
index 5b04310..8ae69d3 100644
--- a/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
+++ b/src/main/java/org/openecomp/datarouter/util/FileWatcher.java
@@ -34,14 +34,15 @@ public abstract class FileWatcher extends TimerTask {
     this.timeStamp = file.lastModified();
   }
 
+  @Override
   public final void run() {
-    long timeStamp = file.lastModified();
+    long newTimeStamp = file.lastModified();
 
-    if ((timeStamp - this.timeStamp) > 500) {
-      this.timeStamp = timeStamp;
+    if ((newTimeStamp - this.timeStamp) > 500) {
+      this.timeStamp = newTimeStamp;
       onChange(file);
     }
   }
   
   protected abstract void onChange(File file);
-}
\ No newline at end of file
+}