Switch to native HttpClient in olog es

ControlSystemStudio · Dec 20, 2024 · 7a96829 · 7a96829
1 parent 4064f8f
commit 7a96829
Show file tree

Hide file tree

Showing 15 changed files with 750 additions and 1,081 deletions.
diff --git a/app/logbook/olog/client-es/pom.xml b/app/logbook/olog/client-es/pom.xml
@@ -11,19 +11,9 @@
 
     <dependencies>
         <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.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>1.19</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

diff --git a/app/logbook/olog/client-es/src/main/java/org/phoebus/applications/logbook/OlogESLogbook.java b/app/logbook/olog/client-es/src/main/java/org/phoebus/applications/logbook/OlogESLogbook.java
@@ -2,7 +2,7 @@
 
 import org.phoebus.logbook.LogClient;
 import org.phoebus.logbook.LogFactory;
-import org.phoebus.olog.es.api.OlogClient.OlogClientBuilder;
+import org.phoebus.olog.es.api.OlogHttpClient;
 import org.phoebus.security.tokens.SimpleAuthenticationToken;
 
 import java.util.logging.Level;
@@ -33,7 +33,7 @@ public String getId() {
     @Override
     public LogClient getLogClient() {
         try {
-            return OlogClientBuilder.serviceURL().create();
+            return OlogHttpClient.builder().build();
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to create olog es client", e);
         }
@@ -50,8 +50,8 @@ public LogClient getLogClient(Object authToken) {
         try {
             if (authToken instanceof SimpleAuthenticationToken) {
                 SimpleAuthenticationToken token = (SimpleAuthenticationToken) authToken;
-                return OlogClientBuilder.serviceURL().withHTTPAuthentication(true).username(token.getUsername()).password(token.getPassword())
-                        .create();
+                return OlogHttpClient.builder().username(token.getUsername()).password(token.getPassword())
+                        .build();
             } else {
                 return getLogClient();
             }

diff --git a/...va/org/phoebus/applications/logbook/authentication/OlogServiceAuthenticationProvider.java b/...va/org/phoebus/applications/logbook/authentication/OlogServiceAuthenticationProvider.java
@@ -18,8 +18,7 @@
 
 package org.phoebus.applications.logbook.authentication;
 
-import org.phoebus.olog.es.api.OlogClient;
-import org.phoebus.olog.es.api.OlogClient.OlogClientBuilder;
+import org.phoebus.olog.es.api.OlogHttpClient;
 import org.phoebus.security.authorization.ServiceAuthenticationProvider;
 import org.phoebus.security.tokens.AuthenticationScope;
 
@@ -30,12 +29,11 @@ public class OlogServiceAuthenticationProvider implements ServiceAuthenticationP
 
     @Override
     public void authenticate(String username, String password){
-        OlogClient ologClient = OlogClientBuilder.serviceURL().create();
         try {
-            ologClient.authenticate(username, password);
+            OlogHttpClient.builder().build().authenticate(username, password);
         } catch (Exception e) {
             Logger.getLogger(OlogServiceAuthenticationProvider.class.getName())
-                    .log(Level.WARNING, "Failed to authenticate user " + username + " against Olog service", e);
+                    .log(Level.WARNING, "Failed to authenticate user " + username + " with logbook service", e);
             throw new RuntimeException(e);
         }
     }