Merge pull request #2903 from ControlSystemStudio/sar

SAR updates
ControlSystemStudio · Jan 12, 2024 · ba042b7 · ba042b7
2 parents f6948e5 + 379a47e
commit ba042b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/...tore/src/main/java/org/phoebus/service/saveandrestore/web/controllers/InfoController.java b/...tore/src/main/java/org/phoebus/service/saveandrestore/web/controllers/InfoController.java
@@ -19,6 +19,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static org.phoebus.applications.saveandrestore.model.Node.ROOT_FOLDER_UNIQUE_ID;
+
 /**
  * Controller implementing endpoints to retrieve service info
  */
@@ -66,6 +68,8 @@ public String info() {
         }
         saveRestoreServiceInfo.put("elastic", elasticInfo);
 
+        saveRestoreServiceInfo.put("rootNodeID", ROOT_FOLDER_UNIQUE_ID);
+
          try {
             return objectMapper.writeValueAsString(saveRestoreServiceInfo);
         } catch (JsonProcessingException e) {

diff --git a/services/save-and-restore/src/main/resources/configuration_mapping.json b/services/save-and-restore/src/main/resources/configuration_mapping.json
@@ -5,18 +5,7 @@
         "type" : "keyword"
       },
       "pvList": {
-        "type" : "nested",
-        "properties": {
-          "pvName": {
-            "type": "keyword"
-          },
-          "readbackPvName": {
-            "type": "keyword"
-          },
-          "readOnly": {
-            "type": "boolean"
-          }
-        }
+        "type" : "flattened"
       }
     }
   }

diff --git a/services/save-and-restore/src/main/resources/snapshot_mapping.json b/services/save-and-restore/src/main/resources/snapshot_mapping.json
@@ -5,23 +5,7 @@
         "type" : "keyword"
       },
       "snapshotItems" : {
-        "type" : "nested",
-        "properties": {
-          "configPv": {
-            "properties": {
-              "pvName" : {
-                "type": "keyword"
-              },
-              "readOnly": {
-                "type" : "boolean"
-              }
-            }
-          },
-          "value": {
-            "enabled": false,
-            "type": "object"
-          }
-        }
+        "type" : "flattened"
       }
     }
   }