Merge pull request #45751 from gsmet/get-rid-of-wildfly-common

Reduce our exposure to wildfly-common

.forbiddenapis/banned-signatures-common.txt

@@ -6,3 +6,13 @@ org.jboss.jandex.AnnotationValue#toString()
 @defaultMessage Replace this by using InputStream.transferTo(OutputStream)
 org.apache.commons.io.IOUtils#copy(java.io.InputStream,java.io.OutputStream)
 org.apache.commons.compress.utils.IOUtils#copy(java.io.InputStream,java.io.OutputStream)
+
+@defaultMessage We should avoid using WildFly Common APIs
+org.wildfly.common.Assert
+org.wildfly.common.net.**
+org.wildfly.common.os.**
+
+@defaultMessage Use JUnit asserts
+io.smallrye.common.Assert.assertTrue(**)
+io.smallrye.common.Assert.assertFalse(**)
+io.smallrye.common.Assert.assertNotNull(**)

core/builder/pom.xml

@@ -25,6 +25,10 @@
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-constraint</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>

core/builder/src/main/java/io/quarkus/builder/BuildChain.java

@@ -6,7 +6,7 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import org.wildfly.common.Assert;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build chain.

core/builder/src/main/java/io/quarkus/builder/BuildChainBuilder.java

@@ -19,9 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.BuildItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build chain builder.

core/builder/src/main/java/io/quarkus/builder/BuildContext.java

@@ -12,13 +12,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.diag.Diagnostic;
 import io.quarkus.builder.item.BuildItem;
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.builder.location.Location;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The context passed to a deployer's operation.

core/builder/src/main/java/io/quarkus/builder/BuildException.java

@@ -3,9 +3,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.diag.Diagnostic;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * @author <a href="mailto:[email protected]">David M. Lloyd</a>

core/builder/src/main/java/io/quarkus/builder/BuildExecutionBuilder.java

@@ -6,9 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.BuildItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A builder for a deployer execution.

core/builder/src/main/java/io/quarkus/builder/BuildStepBuilder.java

@@ -6,9 +6,8 @@
 import java.util.Set;
 import java.util.function.BooleanSupplier;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.BuildItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A builder for build step instances within a chain. A build step can consume and produce items. It may also register

core/builder/src/main/java/io/quarkus/builder/ConsumeFlags.java

@@ -1,8 +1,9 @@
 package io.quarkus.builder;
 
-import org.wildfly.common.Assert;
 import org.wildfly.common.flags.Flags;
 
+import io.smallrye.common.constraint.Assert;
+
 /**
  * Flags which can be set on consume declarations.
  */

core/builder/src/main/java/io/quarkus/builder/ItemId.java

@@ -2,10 +2,9 @@
 
 import java.util.Objects;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.BuildItem;
 import io.quarkus.builder.item.MultiBuildItem;
+import io.smallrye.common.constraint.Assert;
 
 final class ItemId {
     private final Class<? extends BuildItem> itemType;

core/builder/src/main/java/io/quarkus/builder/ProduceFlags.java

@@ -1,8 +1,9 @@
 package io.quarkus.builder;
 
-import org.wildfly.common.Assert;
 import org.wildfly.common.flags.Flags;
 
+import io.smallrye.common.constraint.Assert;
+
 /**
  * Flags which can be set on consume declarations.
  */

core/builder/src/main/java/io/quarkus/builder/diag/Diagnostic.java

@@ -5,9 +5,8 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.location.Location;
+import io.smallrye.common.constraint.Assert;
 
 public final class Diagnostic {
     private final Level level;

core/deployment/src/main/java/io/quarkus/deployment/CodeGenProvider.java

@@ -6,7 +6,6 @@
 import java.util.Objects;
 
 import org.eclipse.microprofile.config.Config;
-import org.wildfly.common.annotation.NotNull;
 
 import io.quarkus.bootstrap.model.ApplicationModel;
 import io.quarkus.bootstrap.prebuild.CodeGenException;
@@ -18,7 +17,6 @@ public interface CodeGenProvider {
     /**
      * @return unique name of the code gen provider, will correspond to the directory in <code>generated-sources</code>
      */
-    @NotNull
     String providerId();
 
     /**
@@ -37,7 +35,6 @@ default String inputExtension() {
      *
      * @return file extensions
      */
-    @NotNull
     default String[] inputExtensions() {
         if (inputExtension() != null) {
             return new String[] { inputExtension() };
@@ -53,7 +50,6 @@ default String[] inputExtensions() {
      *
      * @return the input directory
      */
-    @NotNull
     String inputDirectory();
 
     /**

core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigurationTypeBuildItem.java

@@ -1,8 +1,7 @@
 package io.quarkus.deployment.builditem;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The configuration type build item. Every configuration type should be registered using this build item

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogCategoryBuildItem.java

@@ -2,9 +2,8 @@
 
 import java.util.logging.Level;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * Establish the default log level of a log category.

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogConsoleFormatBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Formatter;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The log console format build item. Producing this item will cause the logging subsystem to disregard its

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogFileFormatBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Formatter;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The log file format build item. Producing this item will cause the logging subsystem to disregard its

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogHandlerBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Handler;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build item for adding additional logging handlers.

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogSocketFormatBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Formatter;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The socket format build item. Producing this item will cause the logging subsystem to disregard its

core/deployment/src/main/java/io/quarkus/deployment/builditem/LogSyslogFormatBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Formatter;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * The syslog format build item. Producing this item will cause the logging subsystem to disregard its

core/deployment/src/main/java/io/quarkus/deployment/builditem/NamedLogHandlersBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Map;
 import java.util.logging.Handler;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build item for adding additional named logging handlers.

core/deployment/src/main/java/io/quarkus/deployment/builditem/RunTimeConfigurationDefaultBuildItem.java

@@ -1,9 +1,8 @@
 package io.quarkus.deployment.builditem;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.annotations.ConfigItem;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build item which specifies a configuration default value for run time, which is used to establish a default other

core/deployment/src/main/java/io/quarkus/deployment/builditem/StreamingLogHandlerBuildItem.java

@@ -3,10 +3,9 @@
 import java.util.Optional;
 import java.util.logging.Handler;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A build item for adding the dev stream log via mutiny.

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -37,7 +37,6 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.Converter;
 import org.jboss.logging.Logger;
-import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.configuration.definition.ClassDefinition;
 import io.quarkus.deployment.configuration.definition.ClassDefinition.ClassMember;
@@ -72,6 +71,7 @@
 import io.quarkus.runtime.configuration.HyphenateEnumConverter;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.quarkus.runtime.configuration.PropertiesUtil;
+import io.smallrye.common.constraint.Assert;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.ConfigMappings;
 import io.smallrye.config.ConfigMappings.ConfigClass;

core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java

@@ -24,7 +24,6 @@
 import org.eclipse.microprofile.config.spi.ConfigBuilder;
 import org.eclipse.microprofile.config.spi.Converter;
 import org.objectweb.asm.Opcodes;
-import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
 import io.quarkus.deployment.configuration.definition.ClassDefinition;
@@ -64,6 +63,7 @@
 import io.quarkus.runtime.configuration.NameIterator;
 import io.quarkus.runtime.configuration.PropertiesUtil;
 import io.quarkus.runtime.configuration.QuarkusConfigFactory;
+import io.smallrye.common.constraint.Assert;
 import io.smallrye.config.ConfigMappings;
 import io.smallrye.config.ConfigMappings.ConfigClass;
 import io.smallrye.config.Converters;

core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/ClassDefinition.java

@@ -5,11 +5,10 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.util.StringUtil;
+import io.smallrye.common.constraint.Assert;
 
 /**
  *

core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/RootDefinition.java

@@ -9,11 +9,10 @@
 
 import java.util.List;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
+import io.smallrye.common.constraint.Assert;
 
 /**
  *

core/deployment/src/main/java/io/quarkus/deployment/configuration/matching/ConfigPatternMap.java

@@ -6,9 +6,8 @@
 import java.util.TreeMap;
 import java.util.function.BiFunction;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.runtime.configuration.NameIterator;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A pattern-matching mapping of configuration key pattern to value.

core/deployment/src/main/java/io/quarkus/deployment/configuration/matching/FieldContainer.java

@@ -1,9 +1,8 @@
 package io.quarkus.deployment.configuration.matching;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.deployment.configuration.definition.ClassDefinition;
 import io.quarkus.deployment.configuration.definition.RootDefinition;
+import io.smallrye.common.constraint.Assert;
 
 /**
  *

core/deployment/src/main/java/io/quarkus/deployment/configuration/matching/MapContainer.java

@@ -1,8 +1,7 @@
 package io.quarkus.deployment.configuration.matching;
 
-import org.wildfly.common.Assert;
-
 import io.quarkus.deployment.configuration.definition.ClassDefinition;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A map container.

core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java

@@ -51,7 +51,6 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
-import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.proxy.ProxyConfiguration;
 import io.quarkus.deployment.proxy.ProxyFactory;
@@ -76,6 +75,7 @@
 import io.quarkus.runtime.types.GenericArrayTypeImpl;
 import io.quarkus.runtime.types.ParameterizedTypeImpl;
 import io.quarkus.runtime.types.WildcardTypeImpl;
+import io.smallrye.common.constraint.Assert;
 
 /**
  * A class that can be used to record invocations to bytecode so they can be replayed later. This is done through the