#9990 Move rest of config related classes from swirlds-common to conf… (

#9991)

Signed-off-by: Timo Brandstätter <timo@swirldslabs.com>
Co-authored-by: JeffreyDallas <39912573+JeffreyDallas@users.noreply.github.com>

hedera-node/hedera-config/src/main/java/com/hedera/node/config/Utils.java

@@ -16,8 +16,8 @@
 
 package com.hedera.node.config;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.lang.reflect.RecordComponent;
 import java.util.Arrays;

hedera-node/hedera-config/src/main/java/com/hedera/node/config/validation/EmulatesMapValidator.java

@@ -17,12 +17,12 @@
 package com.hedera.node.config.validation;
 
 import com.hedera.node.config.types.KeyValuePair;
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
-import com.swirlds.common.config.reflection.ConfigReflectionUtils.AnnotatedProperty;
-import com.swirlds.common.config.validators.DefaultConfigViolation;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils.AnnotatedProperty;
+import com.swirlds.config.extensions.validators.DefaultConfigViolation;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

platform-sdk/swirlds-benchmarks/src/jmh/java/com/swirlds/benchmark/BaseBench.java

@@ -17,7 +17,6 @@
 package com.swirlds.benchmark;
 
 import com.swirlds.benchmark.config.BenchmarkConfig;
-import com.swirlds.common.config.export.ConfigExport;
 import com.swirlds.common.config.singleton.ConfigurationHolder;
 import com.swirlds.common.constructable.ConstructableRegistry;
 import com.swirlds.common.constructable.ConstructableRegistryException;
@@ -26,6 +25,7 @@
 import com.swirlds.common.metrics.config.MetricsConfig;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.ConfigurationBuilder;
+import com.swirlds.config.extensions.export.ConfigExport;
 import com.swirlds.config.extensions.sources.LegacyFileConfigSource;
 import com.swirlds.merkledb.config.MerkleDbConfig;
 import com.swirlds.virtualmap.config.VirtualMapConfig;

platform-sdk/swirlds-common/build.gradle.kts

@@ -32,7 +32,6 @@ testModuleInfo {
     requires("com.swirlds.test.framework")
     requires("com.swirlds.base.test.fixtures")
     requires("com.swirlds.config.api.test.fixtures")
-    requires("com.swirlds.config.extensions")
     requires("org.assertj.core")
     requires("org.junit.jupiter.api")
     requires("org.junit.jupiter.params")

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/config/TransactionConfig.java

@@ -16,12 +16,12 @@
 
 package com.swirlds.common.config;
 
-import com.swirlds.common.config.validators.DefaultConfigViolation;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.ConstraintMethod;
+import com.swirlds.config.extensions.validators.DefaultConfigViolation;
 
 /**
  * Configuration regarding transactions

platform-sdk/swirlds-common/src/main/java/module-info.java

@@ -5,10 +5,7 @@
     exports com.swirlds.common.bloom;
     exports com.swirlds.common.bloom.hasher;
     exports com.swirlds.common.config;
-    exports com.swirlds.common.config.export;
-    exports com.swirlds.common.config.reflection;
     exports com.swirlds.common.config.singleton;
-    exports com.swirlds.common.config.validators;
     exports com.swirlds.common.constructable;
     exports com.swirlds.common.constructable.internal;
     exports com.swirlds.common.context;
@@ -174,6 +171,7 @@
     requires transitive io.prometheus.simpleclient;
     requires transitive lazysodium.java;
     requires transitive org.apache.logging.log4j;
+    requires com.swirlds.config.extensions;
     requires com.sun.jna;
     requires io.github.classgraph;
     requires io.prometheus.simpleclient.httpserver;

platform-sdk/swirlds-config-extensions/build.gradle.kts

@@ -18,3 +18,9 @@ plugins {
     id("com.hedera.hashgraph.sdk.conventions")
     id("com.hedera.hashgraph.platform-maven-publish")
 }
+
+testModuleInfo {
+    requires("com.swirlds.common")
+    requires("com.swirlds.test.framework")
+    requires("org.junit.jupiter.api")
+}

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/config/export/ConfigExport.java → platform-sdk/swirlds-config-extensions/src/main/java/com/swirlds/config/extensions/export/ConfigExport.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.swirlds.common.config.export;
+package com.swirlds.config.extensions.export;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.io.OutputStream;

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/config/reflection/ConfigReflectionUtils.java → platform-sdk/swirlds-config-extensions/src/main/java/com/swirlds/config/extensions/reflection/ConfigReflectionUtils.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.swirlds.common.config.reflection;
+package com.swirlds.config.extensions.reflection;
 
-import com.swirlds.common.utility.CommonUtils;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import com.swirlds.config.api.Configuration;
@@ -29,6 +28,7 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -131,8 +131,8 @@ public static String getNamePrefixForConfigDataRecord(final AnnotatedElement typ
     public static <A extends Annotation, V>
             List<AnnotatedProperty<A, V>> getAllMatchingPropertiesForConstraintAnnotation(
                     final Class<A> constraintAnnotationType, final Configuration configuration) {
-        CommonUtils.throwArgNull(constraintAnnotationType, "annotationType");
-        CommonUtils.throwArgNull(configuration, "configuration");
+        Objects.requireNonNull(constraintAnnotationType, "annotationType can not be null");
+        Objects.requireNonNull(configuration, "configuration can not be null");
         return configuration.getConfigDataTypes().stream()
                 .flatMap(recordType -> Arrays.stream(recordType.getRecordComponents()))
                 .filter(component -> component.isAnnotationPresent(constraintAnnotationType))

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/config/validators/DefaultConfigViolation.java → platform-sdk/swirlds-config-extensions/src/main/java/com/swirlds/config/extensions/validators/DefaultConfigViolation.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.swirlds.common.config.validators;
+package com.swirlds.config.extensions.validators;
 
-import com.swirlds.common.utility.CommonUtils;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.PropertyMetadata;
+import java.util.Objects;
 
 /**
  * An immutable default implementation of {@link ConfigViolation}.
@@ -45,7 +45,7 @@ public record DefaultConfigViolation(String propertyName, String value, boolean
      * @return
      */
     public static ConfigViolation of(final PropertyMetadata<?> metadata, final String message) {
-        CommonUtils.throwArgNull(metadata, "metadata");
+        Objects.requireNonNull(metadata, "metadata can not be null");
         return new DefaultConfigViolation(metadata.getName(), metadata.getRawValue(), metadata.exists(), message);
     }
 

platform-sdk/swirlds-config-extensions/src/main/java/module-info.java

@@ -1,5 +1,8 @@
 module com.swirlds.config.extensions {
+    exports com.swirlds.config.extensions.export;
+    exports com.swirlds.config.extensions.reflection;
     exports com.swirlds.config.extensions.sources;
+    exports com.swirlds.config.extensions.validators;
 
     requires transitive com.swirlds.config.api;
     requires com.swirlds.base;

platform-sdk/swirlds-common/src/test/java/com/swirlds/common/config/export/ConfigExportTest.java → platform-sdk/swirlds-config-extensions/src/test/java/com/swirlds/config/extensions/test/export/ConfigExportTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.swirlds.common.config.export;
+package com.swirlds.config.extensions.test.export;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -23,6 +23,7 @@
 import com.swirlds.common.metrics.config.MetricsConfig;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.ConfigurationBuilder;
+import com.swirlds.config.extensions.export.ConfigExport;
 import com.swirlds.config.extensions.sources.PropertyFileConfigSource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/internal/ConfigDataFactory.java

@@ -16,10 +16,10 @@
 
 package com.swirlds.config.impl.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import com.swirlds.config.api.Configuration;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.lang.reflect.Constructor;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/validators/annotation/internal/ConstraintMethodConstraintsValidation.java

@@ -16,11 +16,11 @@
 
 package com.swirlds.config.impl.validators.annotation.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.ConstraintMethod;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.stream.Stream;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/validators/annotation/internal/MaxConstraintsValidation.java

@@ -16,11 +16,11 @@
 
 package com.swirlds.config.impl.validators.annotation.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.Max;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import com.swirlds.config.impl.internal.ConfigNumberUtils;
 import com.swirlds.config.impl.validators.DefaultConfigViolation;
 import java.util.stream.Stream;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/validators/annotation/internal/MinConstraintsValidation.java

@@ -16,11 +16,11 @@
 
 package com.swirlds.config.impl.validators.annotation.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.Min;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import com.swirlds.config.impl.internal.ConfigNumberUtils;
 import com.swirlds.config.impl.validators.DefaultConfigViolation;
 import java.util.stream.Stream;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/validators/annotation/internal/NegativeConstraintsValidation.java

@@ -16,11 +16,11 @@
 
 package com.swirlds.config.impl.validators.annotation.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.Negative;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import com.swirlds.config.impl.internal.ConfigNumberUtils;
 import com.swirlds.config.impl.validators.DefaultConfigViolation;
 import java.util.stream.Stream;

platform-sdk/swirlds-config-impl/src/main/java/com/swirlds/config/impl/validators/annotation/internal/PositiveConstraintsValidation.java

@@ -16,11 +16,11 @@
 
 package com.swirlds.config.impl.validators.annotation.internal;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigValidator;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.Positive;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import com.swirlds.config.impl.internal.ConfigNumberUtils;
 import com.swirlds.config.impl.validators.DefaultConfigViolation;
 import java.util.stream.Stream;

platform-sdk/swirlds-jasperdb/build.gradle.kts

@@ -26,7 +26,6 @@ testModuleInfo {
     requires("com.swirlds.common.testing")
     requires("com.swirlds.common.test.fixtures")
     requires("com.swirlds.config.api.test.fixtures")
-    requires("com.swirlds.config.extensions")
     requires("com.swirlds.test.framework")
     requires("org.apache.commons.lang3")
     requires("org.apache.logging.log4j.core")

platform-sdk/swirlds-jasperdb/src/main/java/com/swirlds/merkledb/config/MerkleDbConfig.java

@@ -16,14 +16,14 @@
 
 package com.swirlds.merkledb.config;
 
-import com.swirlds.common.config.validators.DefaultConfigViolation;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.ConstraintMethod;
 import com.swirlds.config.api.validation.annotation.Min;
 import com.swirlds.config.api.validation.annotation.Positive;
+import com.swirlds.config.extensions.validators.DefaultConfigViolation;
 
 /**
  * Instance-wide config for {@code MerkleDbDataSource}.

platform-sdk/swirlds-jasperdb/src/main/java/module-info.java

@@ -32,6 +32,7 @@
     requires transitive com.swirlds.config.api;
     requires transitive com.swirlds.virtualmap;
     requires com.swirlds.base;
+    requires com.swirlds.config.extensions;
     requires com.swirlds.logging;
     requires java.management;
     requires jdk.management;

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/config/internal/PlatformConfigUtils.java

@@ -19,8 +19,8 @@
 import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
 import static com.swirlds.logging.legacy.LogMarker.STARTUP;
 
-import com.swirlds.common.config.reflection.ConfigReflectionUtils;
 import com.swirlds.config.api.Configuration;
+import com.swirlds.config.extensions.reflection.ConfigReflectionUtils;
 import com.swirlds.config.extensions.sources.ConfigMapping;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.BufferedWriter;

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/util/BootstrapUtils.java

@@ -32,7 +32,6 @@
 import com.swirlds.common.config.StateConfig;
 import com.swirlds.common.config.TransactionConfig;
 import com.swirlds.common.config.WiringConfig;
-import com.swirlds.common.config.export.ConfigExport;
 import com.swirlds.common.config.singleton.ConfigurationHolder;
 import com.swirlds.common.constructable.ConstructableRegistry;
 import com.swirlds.common.constructable.ConstructableRegistryException;
@@ -54,6 +53,7 @@
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.ConfigurationBuilder;
 import com.swirlds.config.api.source.ConfigSource;
+import com.swirlds.config.extensions.export.ConfigExport;
 import com.swirlds.config.extensions.sources.LegacyFileConfigSource;
 import com.swirlds.config.extensions.sources.ThreadCountPropertyConfigSource;
 import com.swirlds.fchashmap.config.FCHashMapConfig;

platform-sdk/swirlds-virtualmap/build.gradle.kts

@@ -29,7 +29,6 @@ testModuleInfo {
     requires("com.swirlds.common.test.fixtures")
     requires("com.swirlds.common.testing")
     requires("com.swirlds.config.api.test.fixtures")
-    requires("com.swirlds.config.extensions")
     requires("com.swirlds.test.framework")
     requires("org.junit.jupiter.api")
     requires("org.junit.jupiter.params")

platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/config/VirtualMapConfig.java

@@ -16,14 +16,14 @@
 
 package com.swirlds.virtualmap.config;
 
-import com.swirlds.common.config.validators.DefaultConfigViolation;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.validation.ConfigViolation;
 import com.swirlds.config.api.validation.annotation.ConstraintMethod;
 import com.swirlds.config.api.validation.annotation.Max;
 import com.swirlds.config.api.validation.annotation.Min;
+import com.swirlds.config.extensions.validators.DefaultConfigViolation;
 import com.swirlds.virtualmap.VirtualMap;
 import java.time.Duration;
 

platform-sdk/swirlds-virtualmap/src/main/java/module-info.java

@@ -11,6 +11,7 @@
     requires transitive com.swirlds.common;
     requires transitive com.swirlds.config.api;
     requires com.swirlds.base;
+    requires com.swirlds.config.extensions;
     requires com.swirlds.logging;
     requires java.management; // Test dependency
     requires org.apache.logging.log4j;