Fixing the MonetaryConfig issue

Author: keilw

moneta-core/src/main/java/org/javamoney/moneta/DefaultMonetaryContextFactory.java

@@ -47,7 +47,6 @@
  * {@link RoundingMode}.
  */
 class DefaultMonetaryContextFactory {
-// TODO this should probably go to "convert" in future releases. Analyze feasability of refactoring.
     public MonetaryContext getContext() {
         try {
             Map<String, String> config = MonetaryConfig.getConfig();

moneta-core/src/main/java/org/javamoney/moneta/spi/DefaultConfigProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Anatole Tresch, Werner Keil and others by the @author tag.
+ * Copyright (c) 2012, 2020, Werner Keil and others by the @author tag.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -26,6 +26,8 @@
  * Default implementation of the JavaMoney configuration provider reading all present properties from
  * {@code classpath*:javamoney.properties}. Any key can be explicitly overridden by using system
  * properties.
+ * @deprecated Preview, for 2.0 we may reconsider that e.g. backed by a full scale config subsystem like
+ * Spring or MP Config but for now this is error-prone, see https://hibernate.atlassian.net/browse/HV-1793
  */
 public class DefaultConfigProvider implements MonetaryConfigProvider {
 

moneta-core/src/main/java/org/javamoney/moneta/spi/MonetaryConfig.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2012, 2020, Anatole Tresch, Werner Keil and others by the @author tag.
+  Copyright (c) 2012, 2020, Werner Keil and others by the @author tag.
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not
   use this file except in compliance with the License. You may obtain a copy of
@@ -15,96 +15,133 @@
  */
 package org.javamoney.moneta.spi;
 
-import javax.money.spi.Bootstrap;
+import java.io.IOException;
+import java.net.URL;
 import java.util.*;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Loader for the Java Money JSR configuration.
  *
  * @author Anatole Tresch
- * @deprecated Will be removed from the SPI. Implement and register an instance of {@link MonetaryConfigProvider}
- * instead of.
- * @see MonetaryConfigProvider
+ * @author Werner Keil
  */
-@Deprecated
 public final class MonetaryConfig {
 
     private static final Logger LOG = Logger
             .getLogger(MonetaryConfig.class.getName());
 
     private static final MonetaryConfig INSTANCE = new MonetaryConfig();
 
+    private final Map<String, String> config = new HashMap<>();
+    private final Map<String, Integer> priorities = new HashMap<>();
+
     private MonetaryConfig() {
+        try {
+            Enumeration<URL> urls = getClass().getClassLoader().getResources(
+                    "javamoney.properties");
+            while (urls.hasMoreElements()) {
+                URL url = urls.nextElement();
+                try {
+                    Properties props = new Properties();
+                    props.load(url.openStream());
+                    updateConfig(props);
+                } catch (Exception e) {
+                    LOG.log(Level.SEVERE,
+                            "Error loading javamoney.properties, ignoring "
+                                    + url, e);
+                }
+            }
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, "Error loading javamoney.properties.", e);
+        }
     }
 
-    /**
-     * Sets a new config value. Note that when a custom {@link MonetaryConfigProvider} is registered, writing
-     * of configuration values is not supported. In this case a debug log (fine) is written.
-     *
-     * @param key the key to be set, not null.
-     * @param value the new value, or null.
-     * @return the previous value.
-     */
-    public static String setValue(String key, String value){
-        if(Bootstrap.getService(MonetaryConfigProvider.class) instanceof DefaultConfigProvider) {
-            DefaultConfigProvider defaultConfigProvider = (DefaultConfigProvider)Bootstrap.getService(MonetaryConfigProvider.class);
-            if (value == null) {
-                return defaultConfigProvider.config.remove(key);
+    private void updateConfig(Properties props) {
+        for (Map.Entry<Object, Object> en : props.entrySet()) {
+            String key = en.getKey().toString();
+            String value = en.getValue().toString();
+            int prio = 0;
+            if (key.startsWith("{")) {
+                int index = key.indexOf('}');
+                if (index > 0) {
+                    String prioString = key.substring(1, index);
+                    try {
+                        prio = Integer.parseInt(prioString);
+                        key = key.substring(index + 1);
+                    } catch (NumberFormatException e) {
+                        LOG.warning("Invalid config key in javamoney.properties: " + key);
+                    }
+                }
+            }
+            Integer existingPrio = priorities.get(key);
+            if (Objects.isNull(existingPrio)) {
+                priorities.put(key, prio);
+                config.put(key, value);
+            } else if (existingPrio < prio) {
+                priorities.put(key, prio);
+                config.put(key, value);
+            } else if (existingPrio == prio) {
+                throw new IllegalStateException(
+                        "AmbiguousConfiguration detected for '" + key + "'.");
             }
-            return defaultConfigProvider.config.put(key, value);
+            // else ignore entry with lower prio!
         }
-        LOG.fine("MonetaryConfig does not support deprecated write of " + key + "=" + value);
-        return null;
+    }
+
+    public static String setValue(String key, String value){
+        if(value==null){
+            return INSTANCE.config.remove(key);
+        }
+        return INSTANCE.config.put(key, value);
     }
 
     public static Optional<String> getString(String key){
-        return Optional.ofNullable(Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key));
+        return Optional.ofNullable(INSTANCE.config.get(key));
     }
 
     public static Optional<Boolean> getBoolean(String key){
-        String val = Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key);
+        String val = INSTANCE.config.get(key);
         if(val != null){
             return Optional.ofNullable(Boolean.parseBoolean(val));
         }
         return Optional.empty();
     }
 
     public static Optional<Integer> getInteger(String key){
-        String val = Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key);
+        String val = INSTANCE.config.get(key);
         if(val != null){
             return Optional.ofNullable(Integer.parseInt(val));
         }
         return Optional.empty();
     }
 
     public static Optional<Long> getLong(String key){
-        String val = Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key);
+        String val = INSTANCE.config.get(key);
         if(val != null){
             return Optional.ofNullable(Long.parseLong(val));
         }
         return Optional.empty();
     }
 
     public static Optional<Float> getFloat(String key){
-        String val = Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key);
+        String val = INSTANCE.config.get(key);
         if(val != null){
             return Optional.ofNullable(Float.parseFloat(val));
         }
         return Optional.empty();
     }
 
     public static Optional<Double> getDouble(String key){
-        String val = Bootstrap.getService(MonetaryConfigProvider.class).getProperty(key);
+        String val = INSTANCE.config.get(key);
         if(val != null){
             return Optional.ofNullable(Double.parseDouble(val));
         }
         return Optional.empty();
     }
 
     public static Map<String, String> getConfig() {
-        return Collections.unmodifiableMap(Bootstrap.getService(MonetaryConfigProvider.class).getProperties());
+        return Collections.unmodifiableMap(INSTANCE.config);
     }
-
-
 }

moneta-core/src/main/java/org/javamoney/moneta/spi/MonetaryConfigProvider.java

@@ -20,11 +20,13 @@
 /**
  * Dynamic interface for providing monetary configuration. Register a custom implementation with the {@link java.util.ServiceLoader}
  * to configure JavaMoney.
+ * @deprecated Preview, for 2.0 we may reconsider that e.g. backed by a full scale config subsystem like
+ * Spring or MP Config but for now this is error-prone, see https://hibernate.atlassian.net/browse/HV-1793
  */
 public interface MonetaryConfigProvider {
 
     /**
-     * Simple methoid to get a property.
+     * Simple method to get a property.
      * @param key the key, not null.
      * @return the value, or null.
      */