Migrated to annotated preferences in channel finder client

Author: georgweiss

app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/CFProperties.java

@@ -73,8 +73,6 @@ public class ChannelFinderClientImpl implements ChannelFinderClient {
     private static final String resourceProperties = "resources/properties";
     private static final String resourceTags = "resources/tags";
 
-
-    private static CFProperties properties = new CFProperties();
     private static final Logger log = Logger.getLogger(ChannelFinderClient.class.getName());
     /**
      * A Builder class to help create the client to the Channelfinder Service
@@ -105,7 +103,7 @@ public static class CFCBuilder {
 
         private CFCBuilder()
         {
-            this.uri = URI.create(properties.getPreferenceValue("serviceURL"));
+            this.uri = URI.create(org.phoebus.channelfinder.Preferences.serviceURL);
             this.protocol = this.uri.getScheme();
         }
 
@@ -259,9 +257,8 @@ public boolean verify(String hostname, SSLSession session) {
                 }
             }
             if (this.withHTTPAuthentication) {
-                this.httpBasicAuthFilter = new HTTPBasicAuthFilter(
-                        properties.getPreferenceValue("username"),
-                        properties.getPreferenceValue("password"));
+                this.httpBasicAuthFilter = new HTTPBasicAuthFilter(org.phoebus.channelfinder.Preferences.username,
+                        org.phoebus.channelfinder.Preferences.password);
             }
 
             return new ChannelFinderClientImpl(this.uri, this.clientConfig, this.httpBasicAuthFilter, this.executor);
@@ -278,7 +275,7 @@ public boolean verify(String hostname, SSLSession session) {
             cfAuthenticatedResource.addFilter(httpBasicAuthFilter);
         }
         // TODO add a preference to add logging
-        if(Boolean.parseBoolean(properties.getPreferenceValue("rawFiltering"))) {
+        if(org.phoebus.channelfinder.Preferences.rawFiltering) {
             client.addFilter(new RawLoggingFilter(Logger.getLogger(RawLoggingFilter.class.getName())));
         }
         this.executor = executor;

app/channel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderClientImpl.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 European Spallation Source ERIC.
+ */
+
+package org.phoebus.channelfinder;
+
+import org.phoebus.framework.preferences.AnnotatedPreferences;
+import org.phoebus.framework.preferences.Preference;
+
+/**
+ * The {@link Preferences} object holds the properties associated with the
+ * channel finder client library initialized using the channelfinder_preferences.properties
+ * or default values.
+ *
+ * The order in which these files will be read. 1. properties file specified
+ * using the system property <tt>channelfinder_preferences.properties</tt>. 2.
+ * channelfinder_preferences.properties file in the users home direcotory. 3.
+ * channelfinder_preferences.properties file in the C:/ on windows and /etc/ on linux. 4.
+ * channelfinder_preferences.properties default file packaged with the library.
+ *
+ * @author shroffk
+ *
+ */
+public class Preferences {
+
+    @Preference
+    public static String serviceURL;
+
+    @Preference
+    public static boolean rawFiltering;
+
+    @Preference
+    public static String username;
+
+    @Preference
+    public static String password;
+
+    static {
+        AnnotatedPreferences.initialize(Preferences.class, "/channelfinder_preferences.properties");
+    }
+}