From 8d82687d563bdbcdfd2ec5f2fff1f8acb8a84e7c Mon Sep 17 00:00:00 2001 From: Umut Ay Bora Date: Wed, 24 Dec 2025 14:10:04 +0100 Subject: [PATCH 1/4] Update ContextStore.java --- src/main/java/context/ContextStore.java | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/context/ContextStore.java b/src/main/java/context/ContextStore.java index a80a3fc..3de3db1 100644 --- a/src/main/java/context/ContextStore.java +++ b/src/main/java/context/ContextStore.java @@ -1,10 +1,15 @@ package context; import properties.PropertyUtilities; + +import java.io.IOException; +import java.io.InputStream; import java.util.Collections; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import static properties.PropertyUtilities.fromPropertyFile; @@ -304,7 +309,23 @@ public static synchronized void loadSystemProperties() { } static { - loadProperties("test.properties", "pom.properties", "app.properties", "pickleib.properties"); + //Loads default property files for some popular property name patterns. + String[] defaultProperties = new String[] { + "pom.properties", + "pickleib.properties", + "app.properties", + "test.properties" + }; + + for (String propertyName : defaultProperties) { + Properties properties = new Properties(); + try (InputStream inputStream = ContextStore.class.getResourceAsStream("/" + propertyName)) { + if (inputStream != null) + properties.load(inputStream); + } + catch (IOException | NullPointerException ignored) {} + merge(properties); + } } } From 4e249c5a36fb56949a5c7e0a9a2131661c46037f Mon Sep 17 00:00:00 2001 From: Umut Ay Bora Date: Wed, 24 Dec 2025 14:10:36 +0100 Subject: [PATCH 2/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5febbc8..e7cd1ee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.github.umutayb context-store - 1.0.1 + 1.0.2 jar Context Store Context Store is a reliable context storage solution where values can be stored, updated and accessed on the same thread! From 181fe316cbf9210a80c700982fc3b219480e02d1 Mon Sep 17 00:00:00 2001 From: Umut Ay Bora Date: Wed, 24 Dec 2025 14:17:39 +0100 Subject: [PATCH 3/4] Update ContextStore.java --- src/main/java/context/ContextStore.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/context/ContextStore.java b/src/main/java/context/ContextStore.java index 3de3db1..1421b84 100644 --- a/src/main/java/context/ContextStore.java +++ b/src/main/java/context/ContextStore.java @@ -2,6 +2,7 @@ import properties.PropertyUtilities; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.util.Collections; @@ -11,7 +12,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; -import static properties.PropertyUtilities.fromPropertyFile; +import static properties.PropertyUtilities.*; /** * --- Imported from Java-Utilities to be a standalone library. --- @@ -319,12 +320,18 @@ public static synchronized void loadSystemProperties() { for (String propertyName : defaultProperties) { Properties properties = new Properties(); - try (InputStream inputStream = ContextStore.class.getResourceAsStream("/" + propertyName)) { - if (inputStream != null) - properties.load(inputStream); + try { + properties.load(new FileReader(propertyName)); + } catch (IOException e) { + try (InputStream inputStream = ContextStore.class.getResourceAsStream("/" + propertyName)) { + if (inputStream != null) { + properties.load(inputStream); + merge(properties); + } + } + catch (IOException | NullPointerException ignored) {} } - catch (IOException | NullPointerException ignored) {} - merge(properties); + } } From f5b5628bc063c68819c2520d81143550523b94fb Mon Sep 17 00:00:00 2001 From: Umut Ay Date: Wed, 24 Dec 2025 14:37:40 +0100 Subject: [PATCH 4/4] Update ContextStore.java --- src/main/java/context/ContextStore.java | 27 ++++--------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/main/java/context/ContextStore.java b/src/main/java/context/ContextStore.java index 1421b84..76824b5 100644 --- a/src/main/java/context/ContextStore.java +++ b/src/main/java/context/ContextStore.java @@ -310,29 +310,10 @@ public static synchronized void loadSystemProperties() { } static { - //Loads default property files for some popular property name patterns. - String[] defaultProperties = new String[] { - "pom.properties", - "pickleib.properties", - "app.properties", - "test.properties" - }; - - for (String propertyName : defaultProperties) { - Properties properties = new Properties(); - try { - properties.load(new FileReader(propertyName)); - } catch (IOException e) { - try (InputStream inputStream = ContextStore.class.getResourceAsStream("/" + propertyName)) { - if (inputStream != null) { - properties.load(inputStream); - merge(properties); - } - } - catch (IOException | NullPointerException ignored) {} - } - - } + Level defaulLogLevel = log.getLevel(); + log.setLevel(Level.OFF); + loadProperties("pom.properties", "pickleib.properties", "app.properties", "test.properties"); + log.setLevel(defaulLogLevel); } }