Updates based on review input

Author: georgweiss

app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/CompareResult.java

@@ -32,9 +32,10 @@ public class CompareResult{
     private VType liveValue;
     private String delta;
 
-    public CompareResult(){
-
-    }
+    /**
+     * Needed by unit tests. Do not remove.
+     */
+    public CompareResult(){}
 
     public CompareResult(String pvName,
         boolean equal,
@@ -57,18 +58,10 @@ public boolean isEqual() {
         return equal;
     }
 
-    public void setEqual(boolean equal) {
-        this.equal = equal;
-    }
-
     public PvCompareMode getPvCompareMode() {
         return pvCompareMode;
     }
 
-    public void setPvCompareMode(PvCompareMode pvCompareMode) {
-        this.pvCompareMode = pvCompareMode;
-    }
-
     public double getTolerance() {
         return tolerance;
     }
@@ -77,12 +70,16 @@ public void setTolerance(double tolerance) {
         this.tolerance = tolerance;
     }
 
+    /**
+     *
+     * @return <code>null</code> indicates failure to connect to PV.
+     */
     public VType getStoredValue() {
         return storedValue;
     }
 
-    public void setStoredValue(VType storedValue) {
-        this.storedValue = storedValue;
+    public String getDelta() {
+        return delta;
     }
 
     /**
@@ -93,23 +90,7 @@ public VType getLiveValue() {
         return liveValue;
     }
 
-    public void setLiveValue(VType liveValue) {
-        this.liveValue = liveValue;
-    }
-
-    public String getDelta() {
-        return delta;
-    }
-
-    public void setDelta(String delta) {
-        this.delta = delta;
-    }
-
     public String getPvName() {
         return pvName;
     }
-
-    public void setPvName(String pvName) {
-        this.pvName = pvName;
-    }
 }

app/save-and-restore/util/src/main/java/org/phoebus/saveandrestore/util/SnapshotUtil.java

@@ -114,7 +114,7 @@ public List<SnapshotItem> takeSnapshot(ConfigurationData configurationData) {
      * @param configPvs List of {@link ConfigPv}s defining a {@link Configuration}.
      * @return A list of {@link SnapshotItem}s holding the values read from IOCs.
      */
-    public List<SnapshotItem> takeSnapshot(List<ConfigPv> configPvs) {
+    public List<SnapshotItem> takeSnapshot(final List<ConfigPv> configPvs) {
         List<SnapshotItem> snapshotItems = new ArrayList<>();
         List<Callable<Void>> callables = new ArrayList<>();
         Map<String, VType> pvValues = Collections.synchronizedMap(new HashMap<>());
@@ -196,20 +196,22 @@ public List<SnapshotItem> takeSnapshot(List<ConfigPv> configPvs) {
 
         // Merge data into SnapshotItems
         for (String pvName : pvValues.keySet()) {
-            SnapshotItem snapshotItem = new SnapshotItem();
-            for (ConfigPv configPv : configPvs) {
-                if (configPv.getPvName().equals(pvName)) {
-                    snapshotItem.setConfigPv(configPv);
-                    break;
+            synchronized (pvValues) {
+                SnapshotItem snapshotItem = new SnapshotItem();
+                for (ConfigPv configPv : configPvs) {
+                    if (configPv.getPvName().equals(pvName)) {
+                        snapshotItem.setConfigPv(configPv);
+                        break;
+                    }
                 }
+                VType value = pvValues.get(pvName);
+                snapshotItem.setValue(value);
+                if (snapshotItem.getConfigPv().getReadbackPvName() != null) {
+                    VType readbackValue = readbackPvValues.get(snapshotItem.getConfigPv().getReadbackPvName());
+                    snapshotItem.setReadbackValue(readbackValue);
+                }
+                snapshotItems.add(snapshotItem);
             }
-            VType value = pvValues.get(pvName);
-            snapshotItem.setValue(value);
-            if (snapshotItem.getConfigPv().getReadbackPvName() != null) {
-                VType readbackValue = readbackPvValues.get(snapshotItem.getConfigPv().getReadbackPvName());
-                snapshotItem.setReadbackValue(readbackValue);
-            }
-            snapshotItems.add(snapshotItem);
         }
 
         return snapshotItems;