Initial work to mix sources and interceptors priorities.

smallrye · Jun 11, 2020 · 1c5dc19 · 1c5dc19
1 parent 845b745
commit 1c5dc19
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 125 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/ConfigValueConfigSourceWrapper.java b/implementation/src/main/java/io/smallrye/config/ConfigValueConfigSourceWrapper.java
@@ -62,6 +62,10 @@ public int getOrdinal() {
         return configSource.getOrdinal();
     }
 
+    ConfigSource unwrap() {
+        return configSource;
+    }
+
     static ConfigValueConfigSource wrap(final ConfigSource configSource) {
         if (configSource instanceof ConfigValueConfigSource) {
             return (ConfigValueConfigSource) configSource;

diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java
@@ -17,6 +17,7 @@
 
 import static io.smallrye.config.ConfigSourceInterceptor.EMPTY;
 import static io.smallrye.config.SmallRyeConfigSourceInterceptor.configSourceInterceptor;
+import static java.util.stream.Collectors.toList;
 
 import java.io.Serializable;
 import java.lang.reflect.Type;
@@ -48,20 +49,8 @@
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc.
  */
 public class SmallRyeConfig implements Config, Serializable {
-
     private static final long serialVersionUID = 8138651532357898263L;
 
-    static final Comparator<ConfigSource> CONFIG_SOURCE_COMPARATOR = new Comparator<ConfigSource>() {
-        @Override
-        public int compare(ConfigSource o1, ConfigSource o2) {
-            int res = Integer.compare(o2.getOrdinal(), o1.getOrdinal());
-            // if 2 config sources have the same ordinal,
-            // provide consistent order by sorting them
-            // according to their name.
-            return res != 0 ? res : o2.getName().compareTo(o1.getName());
-        }
-    };
-
     private final AtomicReference<ConfigSources> configSources;
     private final Map<Type, Converter<?>> converters;
     private final Map<Type, Converter<Optional<?>>> optionalConverters = new ConcurrentHashMap<>();
@@ -229,14 +218,7 @@ public Iterable<ConfigSource> getConfigSources() {
      */
     @Deprecated
     public void addConfigSource(ConfigSource configSource) {
-        configSources.updateAndGet(configSources -> {
-            List<ConfigSource> currentSources = configSources.getSources();
-
-            int oldSize = currentSources.size();
-            List<ConfigSource> newSources = Arrays.asList(currentSources.toArray(new ConfigSource[oldSize + 1]));
-            newSources.set(oldSize, configSource);
-            return new ConfigSources(newSources, configSources);
-        });
+        configSources.updateAndGet(configSources -> new ConfigSources(configSources, configSource));
     }
 
     public <T> T convert(String value, Class<T> asType) {
@@ -270,7 +252,7 @@ private static class ConfigSources implements Serializable {
         private static final long serialVersionUID = 3483018375584151712L;
 
         private final List<ConfigSource> sources;
-        private final List<ConfigSourceInterceptor> interceptors;
+        private final List<ConfigSourceInterceptorWithPriority> interceptors;
         private final ConfigSourceInterceptorContext interceptorChain;
 
         /**
@@ -285,23 +267,21 @@ private static class ConfigSources implements Serializable {
          * @param interceptors the Interceptors to be part of Config.
          */
         ConfigSources(final List<ConfigSource> sources, final List<InterceptorWithPriority> interceptors) {
-            sources.sort(CONFIG_SOURCE_COMPARATOR);
-            interceptors.sort(Comparator.comparingInt(InterceptorWithPriority::getPriority).reversed());
+            final List<ConfigSourceInterceptorWithPriority> sortInterceptors = new ArrayList<>();
+            sortInterceptors.addAll(sources.stream().map(ConfigSourceInterceptorWithPriority::new).collect(toList()));
+            sortInterceptors.addAll(interceptors.stream().map(ConfigSourceInterceptorWithPriority::new).collect(toList()));
+            sortInterceptors.sort(Comparator.comparingInt(ConfigSourceInterceptorWithPriority::getPriority));
 
-            List<ConfigSourceInterceptor> initializedInterceptors = new ArrayList<>();
+            final List<ConfigSourceInterceptorWithPriority> initInterceptors = new ArrayList<>();
             SmallRyeConfigSourceInterceptorContext current = new SmallRyeConfigSourceInterceptorContext(EMPTY, null);
-            for (int i = sources.size() - 1; i >= 0; i--) {
-                current = new SmallRyeConfigSourceInterceptorContext(configSourceInterceptor(sources.get(i)), current);
-            }
-
-            for (int i = interceptors.size() - 1; i >= 0; i--) {
-                ConfigSourceInterceptor interceptor = interceptors.get(i).getInterceptor(current);
-                current = new SmallRyeConfigSourceInterceptorContext(interceptor, current);
-                initializedInterceptors.add(interceptor);
+            for (ConfigSourceInterceptorWithPriority configSourceInterceptor : sortInterceptors) {
+                final ConfigSourceInterceptorWithPriority initInterceptor = configSourceInterceptor.getInterceptor(current);
+                current = new SmallRyeConfigSourceInterceptorContext(initInterceptor.getInterceptor(), current);
+                initInterceptors.add(initInterceptor);
             }
 
-            this.sources = Collections.unmodifiableList(sources);
-            this.interceptors = Collections.unmodifiableList(initializedInterceptors);
+            this.sources = Collections.unmodifiableList(getSources(initInterceptors));
+            this.interceptors = Collections.unmodifiableList(initInterceptors);
             this.interceptorChain = current;
         }
 
@@ -311,36 +291,92 @@ private static class ConfigSources implements Serializable {
          * Config Sources are added to the Config.
          *
          * @param sources the Config Sources to be part of Config.
-         * @param configSources the previous ConfigSources
+         * @param configSource the new ConfigSource to add into the interceptor the chain.
          */
-        ConfigSources(final List<ConfigSource> sources, final ConfigSources configSources) {
-            sources.sort(CONFIG_SOURCE_COMPARATOR);
+        ConfigSources(final ConfigSources sources, final ConfigSource configSource) {
+            final int oldSize = sources.getInterceptors().size();
+            final List<ConfigSourceInterceptorWithPriority> newInterceptors = Arrays
+                    .asList(sources.getInterceptors().toArray(new ConfigSourceInterceptorWithPriority[oldSize + 1]));
+            newInterceptors.set(oldSize, new ConfigSourceInterceptorWithPriority(configSource));
+            newInterceptors.sort(Comparator.comparingInt(ConfigSourceInterceptorWithPriority::getPriority));
 
             SmallRyeConfigSourceInterceptorContext current = new SmallRyeConfigSourceInterceptorContext(EMPTY, null);
-
-            for (int i = sources.size() - 1; i >= 0; i--) {
-                current = new SmallRyeConfigSourceInterceptorContext(configSourceInterceptor(sources.get(i)), current);
-            }
-
-            for (int i = configSources.getInterceptors().size() - 1; i >= 0; i--) {
-                current = new SmallRyeConfigSourceInterceptorContext(configSources.getInterceptors().get(i), current);
+            for (ConfigSourceInterceptorWithPriority configSourceInterceptor : newInterceptors) {
+                final ConfigSourceInterceptor interceptor = configSourceInterceptor.getInterceptor();
+                current = new SmallRyeConfigSourceInterceptorContext(interceptor, current);
             }
 
-            this.sources = Collections.unmodifiableList(sources);
-            this.interceptors = configSources.getInterceptors();
+            this.sources = Collections.unmodifiableList(getSources(newInterceptors));
+            this.interceptors = Collections.unmodifiableList(newInterceptors);
             this.interceptorChain = current;
         }
 
+        private List<ConfigSource> getSources(final List<ConfigSourceInterceptorWithPriority> interceptors) {
+            final List<ConfigSource> sources = interceptors.stream()
+                    .map(ConfigSourceInterceptorWithPriority::getInterceptor)
+                    .filter(SmallRyeConfigSourceInterceptor.class::isInstance)
+                    .map(SmallRyeConfigSourceInterceptor.class::cast)
+                    .map(SmallRyeConfigSourceInterceptor::getSource)
+                    .collect(toList());
+            Collections.reverse(sources);
+            return sources;
+        }
+
         List<ConfigSource> getSources() {
             return sources;
         }
 
-        List<ConfigSourceInterceptor> getInterceptors() {
+        List<ConfigSourceInterceptorWithPriority> getInterceptors() {
             return interceptors;
         }
 
         ConfigSourceInterceptorContext getInterceptorChain() {
             return interceptorChain;
         }
     }
+
+    static class ConfigSourceInterceptorWithPriority implements Comparable<ConfigSourceInterceptorWithPriority>, Serializable {
+        private static final long serialVersionUID = 1637460029437579033L;
+
+        final Function<ConfigSourceInterceptorContext, ConfigSourceInterceptor> interceptor;
+        final int priority;
+        final String name;
+
+        public ConfigSourceInterceptorWithPriority(final InterceptorWithPriority interceptor) {
+            this.interceptor = interceptor::getInterceptor;
+            this.priority = interceptor.getPriority();
+            this.name = "undefined";
+        }
+
+        public ConfigSourceInterceptorWithPriority(final ConfigSource configSource) {
+            this.interceptor = context -> configSourceInterceptor(configSource);
+            this.priority = configSource.getOrdinal();
+            this.name = configSource.getName();
+        }
+
+        public ConfigSourceInterceptorWithPriority(final ConfigSourceInterceptor interceptor, final int priority,
+                final String name) {
+            this.interceptor = (Serializable & Function) context -> interceptor;
+            this.priority = priority;
+            this.name = name;
+        }
+
+        public ConfigSourceInterceptor getInterceptor() {
+            return interceptor.apply(null);
+        }
+
+        public ConfigSourceInterceptorWithPriority getInterceptor(final ConfigSourceInterceptorContext context) {
+            return new ConfigSourceInterceptorWithPriority(interceptor.apply(context), priority, name);
+        }
+
+        public int getPriority() {
+            return priority;
+        }
+
+        @Override
+        public int compareTo(final ConfigSourceInterceptorWithPriority other) {
+            int res = Integer.compare(this.priority, other.priority);
+            return res != 0 ? res : this.name.compareTo(other.name);
+        }
+    }
 }
diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java
@@ -315,7 +315,8 @@ Converter<?> getConverter() {
     }
 
     static class InterceptorWithPriority {
-        static final OptionalInt OPTIONAL_DEFAULT_PRIORITY = OptionalInt.of(ConfigSourceInterceptorFactory.DEFAULT_PRIORITY);
+        private static final OptionalInt OPTIONAL_DEFAULT_PRIORITY = OptionalInt
+                .of(ConfigSourceInterceptorFactory.DEFAULT_PRIORITY);
 
         private final ConfigSourceInterceptorFactory factory;
         private final int priority;
@@ -346,11 +347,11 @@ private InterceptorWithPriority(ConfigSourceInterceptorFactory factory) {
             this.priority = factory.getPriority().orElse(ConfigSourceInterceptorFactory.DEFAULT_PRIORITY);
         }
 
-        public ConfigSourceInterceptor getInterceptor(ConfigSourceInterceptorContext context) {
+        ConfigSourceInterceptor getInterceptor(ConfigSourceInterceptorContext context) {
             return factory.getInterceptor(context);
         }
 
-        public int getPriority() {
+        int getPriority() {
             return priority;
         }
     }

diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigSourceInterceptor.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigSourceInterceptor.java
@@ -43,6 +43,14 @@ public Iterator<ConfigValue> iterateValues(final ConfigSourceInterceptorContext
         return values.iterator();
     }
 
+    public ConfigSource getSource() {
+        if (configSource instanceof ConfigValueConfigSourceWrapper) {
+            return ((ConfigValueConfigSourceWrapper) configSource).unwrap();
+        }
+
+        return configSource;
+    }
+
     public static ConfigSourceInterceptor configSourceInterceptor(final ConfigSource configSource) {
         return new SmallRyeConfigSourceInterceptor(configSource);
     }

diff --git a/implementation/src/test/java/io/smallrye/config/ConfigSourceSortTestCase.java b/implementation/src/test/java/io/smallrye/config/ConfigSourceSortTestCase.java
diff --git a/implementation/src/test/java/io/smallrye/config/ConfigSourceWrapperTestCase.java b/implementation/src/test/java/io/smallrye/config/ConfigSourceWrapperTestCase.java
@@ -105,6 +105,11 @@ public String getValue(final String propertyName) {
         public String getName() {
             return delegate.getName();
         }
+
+        @Override
+        public int getOrdinal() {
+            return delegate.getOrdinal();
+        }
     }
 
     static <T> T assertIsInstance(Class<T> expected, Object thing) {