Skip to content

Move saveandrestore.client preference settings into separate file #2927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tynanford merged 1 commit into from
Jan 29, 2024
Merged

Move saveandrestore.client preference settings into separate file #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../main/java/org/phoebus/applications/saveandrestore/client/SaveAndRestoreJerseyClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
12 changes: 12 additions & 0 deletions app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions app/save-and-restore/app/src/main/resources/save_and_restore_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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