Move logging & messages to private package (#1022)

cdi/src/main/java/io/smallrye/config/inject/SecuritySupport.java

@@ -19,7 +19,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import io.smallrye.config.ConfigLogging;
+import io.smallrye.config._private.ConfigLogging;
 
 /**
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2018 Red Hat inc.

cdi/src/test/java/io/smallrye/config/inject/ValidateInjectionTest.java

@@ -42,11 +42,11 @@
 import org.junit.platform.testkit.engine.Event;
 
 import io.smallrye.config.ConfigMapping;
-import io.smallrye.config.ConfigMessages;
 import io.smallrye.config.ConfigValidationException;
 import io.smallrye.config.ConfigValue;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config._private.ConfigMessages;
 
 /**
  * The Exception messages caused by Config CDI should have the format:<br>

documentation/src/main/docs/config-sources/factories.md

@@ -41,7 +41,7 @@ import java.util.List;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
-import io.smallrye.config.ConfigMessages;
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.PropertiesConfigSource;
 import io.smallrye.config.ConfigSourceContext;
 import io.smallrye.config.ConfigSourceFactory;

documentation/src/main/docs/extensions/interceptors.md

@@ -31,7 +31,7 @@ import static io.smallrye.config.SecretKeys.doLocked;
 import jakarta.annotation.Priority;
 
 import io.smallrye.config.ConfigSourceInterceptor;
-import io.smallrye.config.ConfigLogging;
+import io.smallrye.config._private.ConfigLogging;
 
 @Priority(Priorities.LIBRARY + 200)
 public class LoggingConfigSourceInterceptor implements ConfigSourceInterceptor {

implementation/src/main/java/io/smallrye/config/AbstractLocationConfigSourceLoader.java

@@ -24,6 +24,8 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.Converter;
 
+import io.smallrye.config._private.ConfigMessages;
+
 /**
  * This {@link AbstractLocationConfigSourceLoader} loads {@link ConfigSource}s from a list of specific
  * locations.

implementation/src/main/java/io/smallrye/config/ConfigMappingContext.java

@@ -28,6 +28,7 @@
 
 import io.smallrye.config.ConfigMappingInterface.CollectionProperty;
 import io.smallrye.config.ConfigMappingInterface.NamingStrategy;
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.common.utils.StringUtil;
 
 /**

implementation/src/main/java/io/smallrye/config/ConfigMappingInterface.java

@@ -22,6 +22,7 @@
 import org.eclipse.microprofile.config.spi.Converter;
 
 import io.smallrye.common.constraint.Assert;
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.common.utils.StringUtil;
 
 /**

implementation/src/main/java/io/smallrye/config/ConfigMappingLoader.java

@@ -11,6 +11,7 @@
 import org.eclipse.microprofile.config.inject.ConfigProperties;
 
 import io.smallrye.common.classloader.ClassDefiner;
+import io.smallrye.config._private.ConfigMessages;
 
 public final class ConfigMappingLoader {
     private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();

implementation/src/main/java/io/smallrye/config/ConfigMappingProvider.java

@@ -33,6 +33,7 @@
 import io.smallrye.common.function.Functions;
 import io.smallrye.config.ConfigMappingInterface.CollectionProperty;
 import io.smallrye.config.ConfigMappingInterface.NamingStrategy;
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.common.utils.StringUtil;
 
 /**

implementation/src/main/java/io/smallrye/config/ConfigMappings.java

@@ -16,6 +16,7 @@
 import org.eclipse.microprofile.config.inject.ConfigProperties;
 
 import io.smallrye.config.ConfigMappingInterface.Property;
+import io.smallrye.config._private.ConfigMessages;
 
 public final class ConfigMappings implements Serializable {
     private static final long serialVersionUID = -7790784345796818526L;

implementation/src/main/java/io/smallrye/config/ConfigValueProperties.java

@@ -5,6 +5,8 @@
 import java.io.Reader;
 import java.util.HashMap;
 
+import io.smallrye.config._private.ConfigMessages;
+
 /**
  * Loads properties as {@link ConfigValue}.
  * <p>

implementation/src/main/java/io/smallrye/config/Converters.java

@@ -43,6 +43,7 @@
 
 import org.eclipse.microprofile.config.spi.Converter;
 
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.common.AbstractConverter;
 import io.smallrye.config.common.AbstractDelegatingConverter;
 import io.smallrye.config.common.AbstractSimpleDelegatingConverter;

implementation/src/main/java/io/smallrye/config/ExpressionConfigSourceInterceptor.java

@@ -4,7 +4,7 @@
 import static io.smallrye.common.expression.Expression.Flag.LENIENT_SYNTAX;
 import static io.smallrye.common.expression.Expression.Flag.NO_SMART_BRACES;
 import static io.smallrye.common.expression.Expression.Flag.NO_TRIM;
-import static io.smallrye.config.ConfigMessages.msg;
+import static io.smallrye.config._private.ConfigMessages.msg;
 
 import java.util.function.BiConsumer;
 

implementation/src/main/java/io/smallrye/config/ImplicitConverters.java

@@ -27,6 +27,7 @@
 
 import org.eclipse.microprofile.config.spi.Converter;
 
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.common.utils.StringUtil;
 
 /**

implementation/src/main/java/io/smallrye/config/LoggingConfigSourceInterceptor.java

@@ -4,6 +4,8 @@
 
 import jakarta.annotation.Priority;
 
+import io.smallrye.config._private.ConfigLogging;
+
 @Priority(Priorities.LIBRARY + 250)
 public class LoggingConfigSourceInterceptor implements ConfigSourceInterceptor {
     private static final long serialVersionUID = 367246512037404779L;

implementation/src/main/java/io/smallrye/config/SecretKeysConfigSourceInterceptor.java

@@ -6,6 +6,8 @@
 
 import jakarta.annotation.Priority;
 
+import io.smallrye.config._private.ConfigMessages;
+
 @Priority(Priorities.LIBRARY + 100)
 public class SecretKeysConfigSourceInterceptor implements ConfigSourceInterceptor {
     private static final long serialVersionUID = 7291982039729980590L;

implementation/src/main/java/io/smallrye/config/SecretKeysHandlerConfigSourceInterceptor.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import io.smallrye.config.SecretKeysHandlerFactory.LazySecretKeysHandler;
+import io.smallrye.config._private.ConfigMessages;
 
 public class SecretKeysHandlerConfigSourceInterceptor implements ConfigSourceInterceptor {
     private static final long serialVersionUID = -5228028387733656005L;

implementation/src/main/java/io/smallrye/config/SecuritySupport.java

@@ -24,6 +24,8 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.Arrays;
 
+import io.smallrye.config._private.ConfigLogging;
+
 /**
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2018 Red Hat inc.
  */

implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java

@@ -45,6 +45,8 @@
 
 import io.smallrye.common.annotation.Experimental;
 import io.smallrye.config.SmallRyeConfigBuilder.InterceptorWithPriority;
+import io.smallrye.config._private.ConfigLogging;
+import io.smallrye.config._private.ConfigMessages;
 
 /**
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc.

implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java

@@ -50,6 +50,8 @@
 import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
 import org.eclipse.microprofile.config.spi.Converter;
 
+import io.smallrye.config._private.ConfigMessages;
+
 /**
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc.
  */

implementation/src/main/java/io/smallrye/config/SmallRyeConfigProviderResolver.java

@@ -27,6 +27,8 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
+import io.smallrye.config._private.ConfigMessages;
+
 /**
  * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc.
  * @author <a href="mailto:[email protected]">David M. Lloyd</a>

implementation/src/main/java/io/smallrye/config/ConfigLogging.java → implementation/src/main/java/io/smallrye/config/_private/ConfigLogging.java

@@ -1,4 +1,4 @@
-package io.smallrye.config;
+package io.smallrye.config._private;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

implementation/src/main/java/io/smallrye/config/ConfigMessages.java → implementation/src/main/java/io/smallrye/config/_private/ConfigMessages.java

@@ -1,4 +1,4 @@
-package io.smallrye.config;
+package io.smallrye.config._private;
 
 import java.io.InvalidObjectException;
 import java.lang.reflect.Type;

sources/keystore/src/main/java/io/smallrye/config/source/keystore/KeyStoreConfigSourceFactory.java

@@ -23,13 +23,13 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
 import io.smallrye.config.AbstractLocationConfigSourceFactory;
-import io.smallrye.config.ConfigMessages;
 import io.smallrye.config.ConfigSourceContext;
 import io.smallrye.config.ConfigSourceFactory;
 import io.smallrye.config.ConfigValue;
 import io.smallrye.config.PropertiesConfigSource;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config._private.ConfigMessages;
 import io.smallrye.config.source.keystore.KeyStoreConfig.KeyStore.Alias;
 
 public class KeyStoreConfigSourceFactory implements ConfigSourceFactory {

utils/crypto/src/main/java/io/smallrye/config/crypto/AESGCMNoPaddingSecretKeysHandlerFactory.java

@@ -4,12 +4,12 @@
 import java.util.Base64;
 import java.util.NoSuchElementException;
 
-import io.smallrye.config.ConfigMessages;
 import io.smallrye.config.ConfigSourceContext;
 import io.smallrye.config.ConfigValue;
 import io.smallrye.config.Converters;
 import io.smallrye.config.SecretKeysHandler;
 import io.smallrye.config.SecretKeysHandlerFactory;
+import io.smallrye.config._private.ConfigMessages;
 
 public class AESGCMNoPaddingSecretKeysHandlerFactory implements SecretKeysHandlerFactory {
     public static final String ENCRYPTION_KEY = "smallrye.config.secret-handler.aes-gcm-nopadding.encryption-key";

utils/jasypt/src/main/java/io/smallrye/config/jasypt/JasyptSecretKeysHandlerFactory.java

@@ -2,11 +2,11 @@
 
 import java.util.NoSuchElementException;
 
-import io.smallrye.config.ConfigMessages;
 import io.smallrye.config.ConfigSourceContext;
 import io.smallrye.config.ConfigValue;
 import io.smallrye.config.SecretKeysHandler;
 import io.smallrye.config.SecretKeysHandlerFactory;
+import io.smallrye.config._private.ConfigMessages;
 
 public class JasyptSecretKeysHandlerFactory implements SecretKeysHandlerFactory {
     @Override