From a058f06af17ec1b374e391bf74dc4694c3e72f00 Mon Sep 17 00:00:00 2001 From: Tynan Ford Date: Mon, 29 Jan 2024 08:53:32 -0800 Subject: [PATCH] Split save-and-restore preference settings into separate file --- .../client/SaveAndRestoreJerseyClient.java | 2 +- .../save_and_restore_client_preferences.properties | 12 ++++++++++++ .../save_and_restore_preferences.properties | 9 --------- 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreJerseyClient.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreJerseyClient.java index ae9cf53c92..759d2cff5b 100644 --- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreJerseyClient.java +++ b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreJerseyClient.java @@ -64,7 +64,7 @@ public SaveAndRestoreJerseyClient() { mapper.registerModule(new JavaTimeModule()); mapper.setSerializationInclusion(Include.NON_NULL); - PreferencesReader preferencesReader = new PreferencesReader(SaveAndRestoreClient.class, "/save_and_restore_preferences.properties"); + PreferencesReader preferencesReader = new PreferencesReader(SaveAndRestoreClient.class, "/save_and_restore_client_preferences.properties"); this.jmasarServiceUrl = preferencesReader.get("jmasar.service.url"); String readTimeoutString = preferencesReader.get("httpClient.readTimeout"); diff --git a/app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties b/app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties new file mode 100644 index 0000000000..49b1049438 --- /dev/null +++ b/app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties @@ -0,0 +1,12 @@ +# ------------------------------------------------------ +# Package org.phoebus.applications.saveandrestore.client +# ------------------------------------------------------ + +# The URL to the save-and-restore service +jmasar.service.url=http://localhost:8080/save-restore + +# Read timeout (in ms) used by the Jersey client +httpClient.readTimeout=1000 + +# Connect timeout in (ms) used by the Jersey client +httpClient.connectTimeout=1000 diff --git a/app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties b/app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties index 082fcab433..33d0160ced 100644 --- a/app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties +++ b/app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties @@ -16,12 +16,3 @@ default_search_query=tags=golden # If declared add a date automatically in the name of the snapshot "Take Snapshot" #default_snapshot_name_date_format=yyyy-MM-dd HH:mm:ss - -# The URL to the save-and-restore service -jmasar.service.url=http://localhost:8080/save-restore - -# Read timeout (in ms) used by the Jersey client -httpClient.readTimeout=1000 - -# Connect timeout in (ms) used by the Jersey client -httpClient.connectTimeout=1000