This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch 3207-java_modules in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9c41e14a756e5f4aa1becab207dfc21638b64b0c Author: Andi Huber <[email protected]> AuthorDate: Fri Sep 9 09:51:09 2022 +0200 ISIS-3207: migrate commons --- commons/pom.xml | 1 - commons/src/main/java/module-info.java | 57 ++++++++++++++++++++++ .../internal/base/_Strings_trimmed_Test.java | 2 +- .../commons/internal/compare/ComparatorsTest.java | 10 ++-- .../isis/commons/internal/strings/FormatTest.java | 5 +- 5 files changed, 65 insertions(+), 10 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 09c58706ea..3c9f60e895 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -30,7 +30,6 @@ </description> <properties> - <jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir> </properties> diff --git a/commons/src/main/java/module-info.java b/commons/src/main/java/module-info.java new file mode 100644 index 0000000000..6839775a66 --- /dev/null +++ b/commons/src/main/java/module-info.java @@ -0,0 +1,57 @@ +module org.apache.isis.commons { + exports org.apache.isis.commons.internal.hash; + exports org.apache.isis.commons.internal.testing; + exports org.apache.isis.commons.internal.exceptions; + exports org.apache.isis.commons.internal.reflection; + exports org.apache.isis.commons.internal; + exports org.apache.isis.commons.internal.base; + exports org.apache.isis.commons.internal.collections; + exports org.apache.isis.commons.internal.os; + exports org.apache.isis.commons.internal.proxy; + exports org.apache.isis.commons.handler; + exports org.apache.isis.commons.concurrent; + exports org.apache.isis.commons.internal.debug.xray.graphics; + exports org.apache.isis.commons.internal.primitives; + exports org.apache.isis.commons.internal.image; + exports org.apache.isis.commons.internal.memento; + exports org.apache.isis.commons.internal.collections.snapshot; + exports org.apache.isis.commons.internal.ioc; + exports org.apache.isis.commons.internal.concurrent; + exports org.apache.isis.commons.internal.delegate; + exports org.apache.isis.commons.functional; + exports org.apache.isis.commons.internal.binding; + exports org.apache.isis.commons.internal.context; + exports org.apache.isis.commons.internal.hardening; + exports org.apache.isis.commons.collections; + exports org.apache.isis.commons.having; + exports org.apache.isis.commons.resource; + exports org.apache.isis.commons.internal.compare; + exports org.apache.isis.commons.internal.html; + exports org.apache.isis.commons.internal.graph; + exports org.apache.isis.commons.internal.functions; + exports org.apache.isis.commons.internal.debug; + exports org.apache.isis.commons.internal.debug.xray; + exports org.apache.isis.commons.binding; + exports org.apache.isis.commons.internal.assertions; + exports org.apache.isis.commons.internal.resources; + exports org.apache.isis.commons.internal.codec; + exports org.apache.isis.commons.internal.factory; + + requires com.fasterxml.jackson.annotation; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; + requires com.fasterxml.jackson.module.jaxb; + requires jakarta.jakartaee.api; + requires java.desktop; + requires java.sql; + requires java.xml; + requires java.xml.bind; + requires lombok; + requires org.apache.logging.log4j; + requires org.jdom2; + requires org.jsoup; + requires org.yaml.snakeyaml; + requires spring.beans; + requires spring.context; + requires spring.core; +} \ No newline at end of file diff --git a/commons/src/test/java/org/apache/isis/commons/internal/base/_Strings_trimmed_Test.java b/commons/src/test/java/org/apache/isis/commons/internal/base/_Strings_trimmed_Test.java index ae76dde50c..6a54cdb928 100644 --- a/commons/src/test/java/org/apache/isis/commons/internal/base/_Strings_trimmed_Test.java +++ b/commons/src/test/java/org/apache/isis/commons/internal/base/_Strings_trimmed_Test.java @@ -21,7 +21,7 @@ package org.apache.isis.commons.internal.base; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -public class _Strings_trimmed_Test { +class _Strings_trimmed_Test { @Test public void fits() { diff --git a/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java b/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java index 637fcf8676..81454fcf08 100644 --- a/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java +++ b/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java @@ -30,12 +30,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.isis.commons.internal.collections._Lists; -public class ComparatorsTest { +class ComparatorsTest { @Test void nullArgumentLeftAndRigth() throws Exception { - assertEquals(0, + assertEquals(0, _Comparators.deweyOrderCompare(null, null)); } @@ -131,15 +131,15 @@ public class ComparatorsTest { ); } - private static Collection<String> ofS(String... str) { + private static Collection<String> ofS(final String... str) { return Arrays.asList(str); } - private static List<String> ofL(String... str) { + private static List<String> ofL(final String... str) { return _Lists.newArrayList(ofS(str)); } - private static void assertThatSorting(Collection<String> input, List<String> expected) { + private static void assertThatSorting(final Collection<String> input, final List<String> expected) { final SortedSet<String> treeSet = new TreeSet<String>(_Comparators.deweyOrderComparator); treeSet.addAll(input); assertEquals(expected, _Lists.newArrayList(treeSet)); diff --git a/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java b/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java index af67b8599f..d0a9edde39 100644 --- a/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java +++ b/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java @@ -18,14 +18,13 @@ */ package org.apache.isis.commons.internal.strings; - import org.junit.Test; import org.junit.jupiter.api.Assertions; -public class FormatTest { +class FormatTest { // copy of code in scripts/generateConfigDocs.groovy - public static String format(final String str, int len) { + public static String format(final String str, final int len) { if(str.length() <= len) { return str; }
