From 88411f937c058d0af79e830f24b743b798498760 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Sat, 24 Aug 2019 01:45:17 +0200 Subject: [PATCH 1/3] extract PreferencesBasedStorageHandler from StorageHandlerImpl the abstract class PreferencesBasedStorageHandler can easely be subclassed by a client to use another means than Gson for serialization --- .../util/PreferencesBasedStorageHandler.java | 299 ++++++++++++++++++ .../util/StorageHandlerImpl.java | 257 +-------------- 2 files changed, 308 insertions(+), 248 deletions(-) create mode 100644 preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java new file mode 100644 index 00000000..cbbd25a9 --- /dev/null +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java @@ -0,0 +1,299 @@ +package com.dlsc.preferencesfx.util; + +import static com.dlsc.preferencesfx.util.Constants.DEFAULT_DIVIDER_POSITION; +import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_HEIGHT; +import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_POS_X; +import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_POS_Y; +import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_WIDTH; +import static com.dlsc.preferencesfx.util.Constants.DIVIDER_POSITION; +import static com.dlsc.preferencesfx.util.Constants.SELECTED_CATEGORY; +import static com.dlsc.preferencesfx.util.Constants.WINDOW_HEIGHT; +import static com.dlsc.preferencesfx.util.Constants.WINDOW_POS_X; +import static com.dlsc.preferencesfx.util.Constants.WINDOW_POS_Y; +import static com.dlsc.preferencesfx.util.Constants.WINDOW_WIDTH; + +import com.dlsc.preferencesfx.model.Setting; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Objects; +import java.util.prefs.BackingStoreException; +import java.util.prefs.Preferences; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Handles everything related to storing values of {@link Setting} using {@link Preferences}. + * + * @author François Martin + * @author Marco Sanfratello + */ +public abstract class PreferencesBasedStorageHandler implements StorageHandler { + + private static final Logger LOGGER = + LoggerFactory.getLogger(PreferencesBasedStorageHandler.class.getName()); + + private Preferences preferences; + + public PreferencesBasedStorageHandler(Class saveClass) { + preferences = Preferences.userNodeForPackage(saveClass); + } + + /** + * Serializes an object to a string for storage. + * + *

Subclasses may use any way to serialize the object. + * This should be the inverse operation of {@link #deserialize(String, Class)}. + * + *

Therefore the following must hold true for any x of type X: + * 

+   *   Objects.equals(x, deserialize(serialize(x), X.class)
+   *
+ * + * @param object the object to serialize + * @return string representation of the object for storage + */ + protected abstract String serialize(Object object); + + /** + * Deserializes an object from a string for storage. + * + *

Subclasses may use any way to deserialize the object. + * This should be the inverse operation of {@link #serialize(Object)}. + * + *

Therefore the following must hold true for any x of type X: + * 

+   *   Objects.equals(x, deserialize(serialize(x), X.class)
+   *
+ * + * @param serialized the string to deserialze + * @param type the class into which to deserialize the string + * @return string representation of the object for storage + */ + protected abstract T deserialize(String serialized, Class type); + + + /** + * Stores the last selected category in TreeSearchView. + * + * @param breadcrumb the category path as a breadcrumb string + */ + public void saveSelectedCategory(String breadcrumb) { + preferences.put(SELECTED_CATEGORY, breadcrumb); + } + + /** + * Gets the last selected category in TreeSearchView. + * + * @return the breadcrumb string of the selected category. null if none is found + */ + public String loadSelectedCategory() { + return preferences.get(SELECTED_CATEGORY, null); + } + + /** + * Stores the given divider position of the MasterDetailPane. + * + * @param dividerPosition the divider position to be stored + */ + public void saveDividerPosition(double dividerPosition) { + preferences.putDouble(DIVIDER_POSITION, dividerPosition); + } + + /** + * Gets the stored divider position of the MasterDetailPane. + * + * @return the double value of the divider position. 0.2 if none is found + */ + public double loadDividerPosition() { + return preferences.getDouble(DIVIDER_POSITION, DEFAULT_DIVIDER_POSITION); + } + + /** + * Stores the window width of the PreferencesFxDialog. + * + * @param windowWidth the width of the window to be stored + */ + public void saveWindowWidth(double windowWidth) { + preferences.putDouble(WINDOW_WIDTH, windowWidth); + } + + /** + * Searches for the window width of the PreferencesFxDialog. + * + * @return the double value of the window width. 1000 if none is found + */ + public double loadWindowWidth() { + return preferences.getDouble(WINDOW_WIDTH, DEFAULT_PREFERENCES_WIDTH); + } + + /** + * Stores the window height of the PreferencesFxDialog. + * + * @param windowHeight the height of the window to be stored + */ + public void saveWindowHeight(double windowHeight) { + preferences.putDouble(WINDOW_HEIGHT, windowHeight); + } + + /** + * Searches for the window height of the PreferencesFxDialog. + * + * @return the double value of the window height. 700 if none is found + */ + public double loadWindowHeight() { + return preferences.getDouble(WINDOW_HEIGHT, DEFAULT_PREFERENCES_HEIGHT); + } + + /** + * Stores the position of the PreferencesFxDialog in horizontal orientation. + * + * @param windowPosX the double value of the window position in horizontal orientation + */ + public void saveWindowPosX(double windowPosX) { + preferences.putDouble(WINDOW_POS_X, windowPosX); + } + + /** + * Searches for the horizontal window position. + * + * @return the double value of the horizontal window position + */ + public double loadWindowPosX() { + return preferences.getDouble(WINDOW_POS_X, DEFAULT_PREFERENCES_POS_X); + } + + /** + * Stores the position of the PreferencesFxDialog in vertical orientation. + * + * @param windowPosY the double value of the window position in vertical orientation + */ + public void saveWindowPosY(double windowPosY) { + preferences.putDouble(WINDOW_POS_Y, windowPosY); + } + + /** + * Searches for the vertical window position. + * + * @return the double value of the vertical window position + */ + public double loadWindowPosY() { + return preferences.getDouble(WINDOW_POS_Y, DEFAULT_PREFERENCES_POS_Y); + } + + /** + * Serializes a given Object and saves it to the preferences using the given key. + * + * @param breadcrumb the key which is used to save the serialized Object + * @param object the Object which will be saved + */ + // asciidoctor Documentation - tag::storageHandlerSave[] + public void saveObject(String breadcrumb, Object object) { + preferences.put(hash(breadcrumb), serialize(object)); + } + // asciidoctor Documentation - end::storageHandlerSave[] + + /** + * Searches in the preferences after a serialized Object using the given key, + * deserializes and returns it. Returns a default Object if nothing is found. + * + * @param breadcrumb the key which is used to search the serialized Object + * @param defaultObject the Object which will be returned if nothing is found + * @return the deserialized Object or the default Object if nothing is found + */ + // asciidoctor Documentation - tag::storageHandlerLoad[] + public Object loadObject(String breadcrumb, Object defaultObject) { + String json = getSerializedPreferencesValue(breadcrumb, serialize(defaultObject)); + return deserialize(json, Object.class); + } + // asciidoctor Documentation - end::storageHandlerLoad[] + + /** + * Searches in the preferences after a serialized ArrayList using the given key, + * deserializes and returns it as ObservableArrayList. + * When an ObservableList is deserialzed, Gson returns an ArrayList + * and needs to be wrapped into an ObservableArrayList. This is only needed for loading. + * + * @param breadcrumb the key which is used to search the serialized ArrayList + * @param defaultObservableList the default ObservableList + * which will be returned if nothing is found + * @return the deserialized ObservableList or the default ObservableList if nothing is found + */ + public ObservableList loadObservableList( + String breadcrumb, + ObservableList defaultObservableList + ) { + String json = getSerializedPreferencesValue(breadcrumb, serialize(defaultObservableList)); + return FXCollections.observableArrayList(deserialize(json, ArrayList.class)); + } + + private String getSerializedPreferencesValue(String breadcrumb, String serializedDefault) { + String json = preferences.get(hash(breadcrumb), serializedDefault); + if (json == serializedDefault) { + // try to get preferences value with legacy hashing method + json = preferences.get(deprecatedHash(breadcrumb), serializedDefault); + if (json != serializedDefault) { + LOGGER.warn("Preferences value of {} was loaded using the legacy hashing method. " + + "Value will be saved using the new hashing method with next save.", breadcrumb); + } + } + return json; + } + + /** + * Clears the preferences. + * + * @return true if successful, false if there was an exception. + */ + public boolean clearPreferences() { + try { + preferences.clear(); + } catch (BackingStoreException e) { + return false; + } + return true; + } + + /** + * Legacy hashing method to calculate the SHA256 hash of a key. + * In some circumstances, this approach produces hashes with incorrect encoding, leading to issues + * with loading preferences (see #53). + * This method is only present for migration reasons, to ensure preferences with the old + * hashing format can still be loaded and then saved using the new hashing method + * ({@link #hash(String)}). + * This method may get removed in a later release, so DON'T use this method to save settings! + * + * @return SHA-256 representation of breadcrumb + */ + @Deprecated + private String deprecatedHash(String key) { + Objects.requireNonNull(key); + MessageDigest messageDigest = null; + try { + messageDigest = MessageDigest.getInstance("SHA-256"); + } catch (NoSuchAlgorithmException e) { + LOGGER.error("Hashing algorithm not found!"); + } + messageDigest.update(key.getBytes()); + return new String(messageDigest.digest()); + } + + /** + * Generates a SHA-256 hash of a String. + * Since {@link Preferences#MAX_KEY_LENGTH} is 80, if the breadcrumb is over 80 characters, it + * will lead to an exception while saving. This method generates a SHA-256 hash of the breadcrumb + * to save / load as the key in {@link Preferences}, since those are guaranteed to be + * maximum 64 chars long. + * + * @return SHA-256 representation of breadcrumb + */ + public String hash(String key) { + return Strings.sha256(key); + } + + public Preferences getPreferences() { + return preferences; + } +} diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/StorageHandlerImpl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/StorageHandlerImpl.java index 96287b4e..8f527c0d 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/StorageHandlerImpl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/StorageHandlerImpl.java @@ -1,29 +1,8 @@ package com.dlsc.preferencesfx.util; -import static com.dlsc.preferencesfx.util.Constants.DEFAULT_DIVIDER_POSITION; -import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_HEIGHT; -import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_POS_X; -import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_POS_Y; -import static com.dlsc.preferencesfx.util.Constants.DEFAULT_PREFERENCES_WIDTH; -import static com.dlsc.preferencesfx.util.Constants.DIVIDER_POSITION; -import static com.dlsc.preferencesfx.util.Constants.SELECTED_CATEGORY; -import static com.dlsc.preferencesfx.util.Constants.WINDOW_HEIGHT; -import static com.dlsc.preferencesfx.util.Constants.WINDOW_POS_X; -import static com.dlsc.preferencesfx.util.Constants.WINDOW_POS_Y; -import static com.dlsc.preferencesfx.util.Constants.WINDOW_WIDTH; - import com.dlsc.preferencesfx.model.Setting; import com.google.gson.Gson; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Objects; -import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Handles everything related to storing values of {@link Setting} using {@link Preferences}. @@ -31,240 +10,22 @@ * @author François Martin * @author Marco Sanfratello */ -public class StorageHandlerImpl implements StorageHandler { - - private static final Logger LOGGER = - LoggerFactory.getLogger(StorageHandlerImpl.class.getName()); +public class StorageHandlerImpl extends PreferencesBasedStorageHandler { - private Preferences preferences; - private Gson gson; + private final Gson gson; public StorageHandlerImpl(Class saveClass) { - preferences = Preferences.userNodeForPackage(saveClass); + super(saveClass); gson = new Gson(); } - /** - * Stores the last selected category in TreeSearchView. - * - * @param breadcrumb the category path as a breadcrumb string - */ - public void saveSelectedCategory(String breadcrumb) { - preferences.put(SELECTED_CATEGORY, breadcrumb); - } - - /** - * Gets the last selected category in TreeSearchView. - * - * @return the breadcrumb string of the selected category. null if none is found - */ - public String loadSelectedCategory() { - return preferences.get(SELECTED_CATEGORY, null); - } - - /** - * Stores the given divider position of the MasterDetailPane. - * - * @param dividerPosition the divider position to be stored - */ - public void saveDividerPosition(double dividerPosition) { - preferences.putDouble(DIVIDER_POSITION, dividerPosition); - } - - /** - * Gets the stored divider position of the MasterDetailPane. - * - * @return the double value of the divider position. 0.2 if none is found - */ - public double loadDividerPosition() { - return preferences.getDouble(DIVIDER_POSITION, DEFAULT_DIVIDER_POSITION); - } - - /** - * Stores the window width of the PreferencesFxDialog. - * - * @param windowWidth the width of the window to be stored - */ - public void saveWindowWidth(double windowWidth) { - preferences.putDouble(WINDOW_WIDTH, windowWidth); - } - - /** - * Searches for the window width of the PreferencesFxDialog. - * - * @return the double value of the window width. 1000 if none is found - */ - public double loadWindowWidth() { - return preferences.getDouble(WINDOW_WIDTH, DEFAULT_PREFERENCES_WIDTH); - } - - /** - * Stores the window height of the PreferencesFxDialog. - * - * @param windowHeight the height of the window to be stored - */ - public void saveWindowHeight(double windowHeight) { - preferences.putDouble(WINDOW_HEIGHT, windowHeight); - } - - /** - * Searches for the window height of the PreferencesFxDialog. - * - * @return the double value of the window height. 700 if none is found - */ - public double loadWindowHeight() { - return preferences.getDouble(WINDOW_HEIGHT, DEFAULT_PREFERENCES_HEIGHT); - } - - /** - * Stores the position of the PreferencesFxDialog in horizontal orientation. - * - * @param windowPosX the double value of the window position in horizontal orientation - */ - public void saveWindowPosX(double windowPosX) { - preferences.putDouble(WINDOW_POS_X, windowPosX); - } - - /** - * Searches for the horizontal window position. - * - * @return the double value of the horizontal window position - */ - public double loadWindowPosX() { - return preferences.getDouble(WINDOW_POS_X, DEFAULT_PREFERENCES_POS_X); + @Override + protected String serialize(Object object) { + return gson.toJson(object); } - /** - * Stores the position of the PreferencesFxDialog in vertical orientation. - * - * @param windowPosY the double value of the window position in vertical orientation - */ - public void saveWindowPosY(double windowPosY) { - preferences.putDouble(WINDOW_POS_Y, windowPosY); + @Override + protected T deserialize(String serialized, Class type) { + return gson.fromJson(serialized, type); } - - /** - * Searches for the vertical window position. - * - * @return the double value of the vertical window position - */ - public double loadWindowPosY() { - return preferences.getDouble(WINDOW_POS_Y, DEFAULT_PREFERENCES_POS_Y); - } - - /** - * Serializes a given Object and saves it to the preferences using the given key. - * - * @param breadcrumb the key which is used to save the serialized Object - * @param object the Object which will be saved - */ - // asciidoctor Documentation - tag::storageHandlerSave[] - public void saveObject(String breadcrumb, Object object) { - preferences.put(hash(breadcrumb), gson.toJson(object)); - } - // asciidoctor Documentation - end::storageHandlerSave[] - - /** - * Searches in the preferences after a serialized Object using the given key, - * deserializes and returns it. Returns a default Object if nothing is found. - * - * @param breadcrumb the key which is used to search the serialized Object - * @param defaultObject the Object which will be returned if nothing is found - * @return the deserialized Object or the default Object if nothing is found - */ - // asciidoctor Documentation - tag::storageHandlerLoad[] - public Object loadObject(String breadcrumb, Object defaultObject) { - String json = getSerializedPreferencesValue(breadcrumb, gson.toJson(defaultObject)); - return gson.fromJson(json, Object.class); - } - // asciidoctor Documentation - end::storageHandlerLoad[] - - /** - * Searches in the preferences after a serialized ArrayList using the given key, - * deserializes and returns it as ObservableArrayList. - * When an ObservableList is deserialzed, Gson returns an ArrayList - * and needs to be wrapped into an ObservableArrayList. This is only needed for loading. - * - * @param breadcrumb the key which is used to search the serialized ArrayList - * @param defaultObservableList the default ObservableList - * which will be returned if nothing is found - * @return the deserialized ObservableList or the default ObservableList if nothing is found - */ - public ObservableList loadObservableList( - String breadcrumb, - ObservableList defaultObservableList - ) { - String json = getSerializedPreferencesValue(breadcrumb, gson.toJson(defaultObservableList)); - return FXCollections.observableArrayList(gson.fromJson(json, ArrayList.class)); - } - - private String getSerializedPreferencesValue(String breadcrumb, String serializedDefault) { - String json = preferences.get(hash(breadcrumb), serializedDefault); - if (json == serializedDefault) { - // try to get preferences value with legacy hashing method - json = preferences.get(deprecatedHash(breadcrumb), serializedDefault); - if (json != serializedDefault) { - LOGGER.warn("Preferences value of {} was loaded using the legacy hashing method. " - + "Value will be saved using the new hashing method with next save.", breadcrumb); - } - } - return json; - } - - /** - * Clears the preferences. - * - * @return true if successful, false if there was an exception. - */ - public boolean clearPreferences() { - try { - preferences.clear(); - } catch (BackingStoreException e) { - return false; - } - return true; - } - - /** - * Legacy hashing method to calculate the SHA256 hash of a key. - * In some circumstances, this approach produces hashes with incorrect encoding, leading to issues - * with loading preferences (see #53). - * This method is only present for migration reasons, to ensure preferences with the old - * hashing format can still be loaded and then saved using the new hashing method - * ({@link #hash(String)}). - * This method may get removed in a later release, so DON'T use this method to save settings! - * - * @return SHA-256 representation of breadcrumb - */ - @Deprecated - private String deprecatedHash(String key) { - Objects.requireNonNull(key); - MessageDigest messageDigest = null; - try { - messageDigest = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e) { - LOGGER.error("Hashing algorithm not found!"); - } - messageDigest.update(key.getBytes()); - return new String(messageDigest.digest()); - } - - /** - * Generates a SHA-256 hash of a String. - * Since {@link Preferences#MAX_KEY_LENGTH} is 80, if the breadcrumb is over 80 characters, it - * will lead to an exception while saving. This method generates a SHA-256 hash of the breadcrumb - * to save / load as the key in {@link Preferences}, since those are guaranteed to be - * maximum 64 chars long. - * - * @return SHA-256 representation of breadcrumb - */ - public String hash(String key) { - return Strings.sha256(key); - } - - public Preferences getPreferences() { - return preferences; - } - - } From 725b6e2f66c6b7b90365245e4ed33027333ab6d1 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Sat, 24 Aug 2019 02:06:15 +0200 Subject: [PATCH 2/3] update asciidoc to reflect adding of PreferencesBasedStorageHandler --- docs/index.adoc | 21 +++++++++++++------ .../util/PreferencesBasedStorageHandler.java | 6 ++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/docs/index.adoc b/docs/index.adoc index 43c39a44..bcb69d82 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -348,17 +348,17 @@ This is also a lesson learned for the next project. ==== StorageHandler We used the `Preferences API` for storing all the data our API requires. Such as window position and size and all the setting values. -For that reason we implemented a class called `StorageHandler.java`. +For that reason we provide an interface called `StorageHandler`. The API can store all primitive data types and character arrays. In some cases for example when storing an `ObjectProperty` we faced the challenge to save an object. The only solution to do this was to serialize the object, save it as character array and when loading, deserialize it. We tried serializing objects using several plugins but none of them worked reliably. -Finally we found a plugin which satisfied all of our needs: -The https://github.com/google/gson/blob/master/UserGuide.md[`Google GSON`] plugin is used in a very effective easy way and works well. +Finally we found a library which satisfied all of our needs: +The https://github.com/google/gson/blob/master/UserGuide.md[`Google GSON`] library is used in a very effective easy way and works well. Using the API is very simple: -One hands over an `Object` and gets a `String`: +One hands over an `Object` and gets back a `String`: [source,java] ---- @@ -392,8 +392,17 @@ include::{sourcedir}/com/dlsc/preferencesfx/util/StorageHandler.java[tags=storag include::{sourcedir}/com/dlsc/preferencesfx/util/StorageHandler.java[tags=storageHandlerLoad] ---- +The usage of GSON is hidden behind two abstract methods in the class `PreferencesBasedStorageHandler`. +This allows users of PreferenceFX to easily replace GSON with a different library if the have the need to do so. + +[source,java] +---- +include::{sourcedir}/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java[tags=serializationDeserialization] +---- + + Well the method is working. -But another problem occured. +But another problem occurred. Where does `PreferencesFX` know which setting has which value? We decided to give each `Setting` a `breadcrumb` which represents the path from the `Category` and the `Group` it belongs to, separated with a delimiter. The actual challenge was to create them. @@ -548,4 +557,4 @@ All external sources have been named and quoted material has been attributed app The signatures are delivered separately. -Windisch, 19. January 2018 \ No newline at end of file +Windisch, 19. January 2018 diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java index cbbd25a9..09c815d3 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java @@ -41,6 +41,7 @@ public PreferencesBasedStorageHandler(Class saveClass) { preferences = Preferences.userNodeForPackage(saveClass); } + // asciidoctor Documentation - tag::serializationDeserialization[] /** * Serializes an object to a string for storage. * @@ -73,6 +74,7 @@ public PreferencesBasedStorageHandler(Class saveClass) { * @return string representation of the object for storage */ protected abstract T deserialize(String serialized, Class type); + // asciidoctor Documentation - end::serializationDeserialization[] /** @@ -189,11 +191,9 @@ public double loadWindowPosY() { * @param breadcrumb the key which is used to save the serialized Object * @param object the Object which will be saved */ - // asciidoctor Documentation - tag::storageHandlerSave[] public void saveObject(String breadcrumb, Object object) { preferences.put(hash(breadcrumb), serialize(object)); } - // asciidoctor Documentation - end::storageHandlerSave[] /** * Searches in the preferences after a serialized Object using the given key, @@ -203,12 +203,10 @@ public void saveObject(String breadcrumb, Object object) { * @param defaultObject the Object which will be returned if nothing is found * @return the deserialized Object or the default Object if nothing is found */ - // asciidoctor Documentation - tag::storageHandlerLoad[] public Object loadObject(String breadcrumb, Object defaultObject) { String json = getSerializedPreferencesValue(breadcrumb, serialize(defaultObject)); return deserialize(json, Object.class); } - // asciidoctor Documentation - end::storageHandlerLoad[] /** * Searches in the preferences after a serialized ArrayList using the given key, From 72da12483fd0edb19e10ad71ee91e45dc3c6cef7 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Sun, 25 Aug 2019 11:46:12 +0200 Subject: [PATCH 3/3] rename local variables from json -> serialized --- .../util/PreferencesBasedStorageHandler.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java index 09c815d3..9e6d80bd 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/util/PreferencesBasedStorageHandler.java @@ -204,8 +204,8 @@ public void saveObject(String breadcrumb, Object object) { * @return the deserialized Object or the default Object if nothing is found */ public Object loadObject(String breadcrumb, Object defaultObject) { - String json = getSerializedPreferencesValue(breadcrumb, serialize(defaultObject)); - return deserialize(json, Object.class); + String serialized = getSerializedPreferencesValue(breadcrumb, serialize(defaultObject)); + return deserialize(serialized, Object.class); } /** @@ -223,21 +223,21 @@ public ObservableList loadObservableList( String breadcrumb, ObservableList defaultObservableList ) { - String json = getSerializedPreferencesValue(breadcrumb, serialize(defaultObservableList)); - return FXCollections.observableArrayList(deserialize(json, ArrayList.class)); + String serialized = getSerializedPreferencesValue(breadcrumb, serialize(defaultObservableList)); + return FXCollections.observableArrayList(deserialize(serialized, ArrayList.class)); } private String getSerializedPreferencesValue(String breadcrumb, String serializedDefault) { - String json = preferences.get(hash(breadcrumb), serializedDefault); - if (json == serializedDefault) { + String serialized = preferences.get(hash(breadcrumb), serializedDefault); + if (serialized == serializedDefault) { // try to get preferences value with legacy hashing method - json = preferences.get(deprecatedHash(breadcrumb), serializedDefault); - if (json != serializedDefault) { + serialized = preferences.get(deprecatedHash(breadcrumb), serializedDefault); + if (serialized != serializedDefault) { LOGGER.warn("Preferences value of {} was loaded using the legacy hashing method. " + "Value will be saved using the new hashing method with next save.", breadcrumb); } } - return json; + return serialized; } /**