Merge pull request #3148 from ControlSystemStudio/ditch-jersey-client

Ditch jersey client
ControlSystemStudio · Oct 23, 2024 · 5f38c94 · 5f38c94
2 parents 323b72e + 37b108d
commit 5f38c94
Show file tree

Hide file tree

Showing 11 changed files with 1,260 additions and 785 deletions.
diff --git a/app/save-and-restore/app/pom.xml b/app/save-and-restore/app/pom.xml
@@ -9,6 +9,10 @@
 
 	<artifactId>save-and-restore</artifactId>
 
+	<properties>
+		<skipITs>true</skipITs>
+	</properties>
+
 	<dependencies>
 
 		<dependency>
@@ -43,18 +47,6 @@
 			<version>${jgit.version}</version>
 		</dependency>
 
-
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-core</artifactId>
-			<version>1.19</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>1.19</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -96,5 +88,24 @@
 				</includes>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.2.5</version>
+			</plugin>
+			<!-- use self-contained integration tests - org.phoebus.olog.docker -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>3.2.5</version>
+				<configuration>
+					<skipITs>${skipITs}</skipITs>
+					<includes>
+						<include>**/*IT.java</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
diff --git a/...pp/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreClient.java b/...pp/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreClient.java
@@ -55,11 +55,11 @@ public interface SaveAndRestoreClient {
     List<SnapshotItem> getCompositeSnapshotItems(String uniqueNodeId);
 
     /**
-     * @param unqiueNodeId Unique id of a {@link Node}
+     * @param uniqueNodeId Unique id of a {@link Node}
      * @return The parent {@link Node} of the specified id. May be null if the unique id is associated with the root
      * {@link Node}
      */
-    Node getParentNode(String unqiueNodeId);
+    Node getParentNode(String uniqueNodeId);
 
     /**
      * @param uniqueNodeId Id of an existing {@link Node}
@@ -107,10 +107,6 @@ public interface SaveAndRestoreClient {
      */
     List<Tag> getAllTags();
 
-    /**
-     * @return All snapshot {@link Node}s persisted on the remote service
-     */
-    List<Node> getAllSnapshots();
 
     /**
      * Move a set of {@link Node}s to a new parent {@link Node}
@@ -130,10 +126,13 @@ public interface SaveAndRestoreClient {
      */
     Node copyNodes(List<String> sourceNodeIds, String targetNodeId);
 
+    /**
+     * Constructs a path like string to facilitate location of a {@link Node} in the tree structure.
+     * @param uniqueNodeId Unique id
+     * @return Path like /Root folder/foo/bar/my/favourite/node
+     */
     String getFullPath(String uniqueNodeId);
 
-    List<Node> getFromPath(String path);
-
     ConfigurationData getConfigurationData(String nodeId);
 
     /**
@@ -151,6 +150,12 @@ public interface SaveAndRestoreClient {
 
     SnapshotData getSnapshotData(String uniqueId);
 
+    /**
+     * Creates a {@link Snapshot}
+     * @param parentNodeId The unique id of the configuration {@link Node} associated with the {@link Snapshot}
+     * @param snapshot The {@link Snapshot} data object.
+     * @return The new {@link Snapshot} as persisted by the service
+     */
     Snapshot createSnapshot(String parentNodeId, Snapshot snapshot);
 
     Snapshot updateSnapshot(Snapshot snapshot);