From 98ffdc3a8a32a46e47ee1311472fdc83acedb38b Mon Sep 17 00:00:00 2001 From: astrapi69 Date: Sun, 5 Nov 2023 20:49:36 +0100 Subject: [PATCH] update of com.github.ben-manes.versions.gradle.plugin to new version 0.49.0 - update of gradle-plugin dependency 'org.ajoberstar.grgit:grgit-gradle' to new version 5.2.1 - update of gradle-plugin dependency of 'com.diffplug.spotless:spotless-plugin-gradle' in version 6.22.0 - update of dependency jobj-reflect to new major version 2.4 - update of dependency jobj-copy to new minor version 4.2-SNAPSHOT --- CHANGELOG.md | 6 ++++++ gradle.properties | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../random/object/RandomObjectFactory.java | 6 +++--- .../astrapi69/random/RandomCharactersTest.java | 3 ++- .../address/RandomAddressExtensionsTest.java | 2 +- .../number/RandomNumberExtensionsTest.java | 2 +- .../random/object/RandomObjectFactoryTest.java | 5 +++-- .../object/RandomWebObjectFactoryTest.java | 2 +- 9 files changed, 27 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdcca21..912d84c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ Version 10.2-SNAPSHOT ------------- +CHANGED: +- update of com.github.ben-manes.versions.gradle.plugin to new version 0.49.0 +- update of gradle-plugin dependency 'org.ajoberstar.grgit:grgit-gradle' to new version 5.2.1 +- update of gradle-plugin dependency of 'com.diffplug.spotless:spotless-plugin-gradle' in version 6.22.0 +- update of dependency jobj-reflect to new major version 2.4 +- update of dependency jobj-copy to new minor version 4.2-SNAPSHOT Version 10.1 ------------- diff --git a/gradle.properties b/gradle.properties index 01b6d70..1e42966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,28 +28,28 @@ projectRepositoriesPasswordKey=ossrhPassword ########################### # gradle-plugins versions # ########################### -gradlePluginVersionsVersion=0.48.0 +gradlePluginVersionsVersion=0.49.0 licenseGradlePluginVersion=0.16.1 -grgitGradlePluginVersion=5.2.0 -spotlessGradlePluginVersion=6.21.0 +grgitGradlePluginVersion=5.2.1 +spotlessGradlePluginVersion=6.22.0 ######################### # dependencies versions # ######################### -jobjCoreVersion=8 -jobjReflectVersion=2 +jobjCoreVersion=8.1 +jobjReflectVersion=2.4 sillyCollectionVersion=27 vintageTimeVersion=6 sillyMathVersion=2.2 -jobjCopyVersion=4.1 +jobjCopyVersion=4.2-SNAPSHOT ############################## # test dependencies versions # ############################## commonsLang3Version=3.13.0 -sillyStringsVersion=8.2 +sillyStringsVersion=9 meanbeanVersion=2.0.3 testngVersion=7.8.0 -testObjectVersion=7.2 -equalsverifierVersion=3.15.1 +testObjectVersion=8.1 +equalsverifierVersion=3.15.2 ########################## # for deploy on sonatype # ########################## diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 93068e3..730b4f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Wed Jan 22 15:59:51 CET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/astrapi69/random/object/RandomObjectFactory.java b/src/main/java/io/github/astrapi69/random/object/RandomObjectFactory.java index a9b7377..1d44e88 100644 --- a/src/main/java/io/github/astrapi69/random/object/RandomObjectFactory.java +++ b/src/main/java/io/github/astrapi69/random/object/RandomObjectFactory.java @@ -59,6 +59,7 @@ import io.github.astrapi69.random.number.RandomIntFactory; import io.github.astrapi69.random.number.RandomLongFactory; import io.github.astrapi69.random.number.RandomShortFactory; +import io.github.astrapi69.reflection.InstanceFactory; import io.github.astrapi69.reflection.ReflectionExtensions; /** @@ -135,7 +136,7 @@ public static T newRandomObject(final Class cls, String... ignoreFieldNam throws IllegalAccessException, InstantiationException, NoSuchFieldException { Objects.requireNonNull(cls); - T instance = ReflectionExtensions.newInstance(cls); + T instance = InstanceFactory.newInstance(cls); return setRandomValues(cls, instance, ignoreFieldNames); } @@ -162,8 +163,7 @@ public static T newRandomObject(final Class cls, String... ignoreFieldNam */ @SuppressWarnings("unchecked") public static T newRandomObject(final T obj, String... ignoreFieldNames) - throws IllegalAccessException, InstantiationException, NoSuchFieldException, - ClassNotFoundException + throws IllegalAccessException, InstantiationException, NoSuchFieldException { Objects.requireNonNull(obj); Class cls = (Class)obj.getClass(); diff --git a/src/test/java/io/github/astrapi69/random/RandomCharactersTest.java b/src/test/java/io/github/astrapi69/random/RandomCharactersTest.java index e995f76..aa3449b 100644 --- a/src/test/java/io/github/astrapi69/random/RandomCharactersTest.java +++ b/src/test/java/io/github/astrapi69/random/RandomCharactersTest.java @@ -28,7 +28,8 @@ import org.testng.annotations.Test; -import io.github.astrapi69.AbstractTestCase; +import io.github.astrapi69.test.base.AbstractTestCase; + /** * The unit test class for the class {@link RandomCharacters} diff --git a/src/test/java/io/github/astrapi69/random/address/RandomAddressExtensionsTest.java b/src/test/java/io/github/astrapi69/random/address/RandomAddressExtensionsTest.java index 019409e..c80951c 100644 --- a/src/test/java/io/github/astrapi69/random/address/RandomAddressExtensionsTest.java +++ b/src/test/java/io/github/astrapi69/random/address/RandomAddressExtensionsTest.java @@ -36,9 +36,9 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.github.astrapi69.BaseTestCase; import io.github.astrapi69.random.util.PropertiesLoader; import io.github.astrapi69.string.StringExtensions; +import io.github.astrapi69.test.base.BaseTestCase; /** * The unit test class for the class {@link RandomAddressExtensions}. diff --git a/src/test/java/io/github/astrapi69/random/number/RandomNumberExtensionsTest.java b/src/test/java/io/github/astrapi69/random/number/RandomNumberExtensionsTest.java index bdba02e..1bcd76c 100644 --- a/src/test/java/io/github/astrapi69/random/number/RandomNumberExtensionsTest.java +++ b/src/test/java/io/github/astrapi69/random/number/RandomNumberExtensionsTest.java @@ -32,8 +32,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.github.astrapi69.BaseTestCase; import io.github.astrapi69.string.StringExtensions; +import io.github.astrapi69.test.base.BaseTestCase; /** * The unit test class for the class {@link RandomNumberExtensions} diff --git a/src/test/java/io/github/astrapi69/random/object/RandomObjectFactoryTest.java b/src/test/java/io/github/astrapi69/random/object/RandomObjectFactoryTest.java index 9ee8ecf..bd36023 100644 --- a/src/test/java/io/github/astrapi69/random/object/RandomObjectFactoryTest.java +++ b/src/test/java/io/github/astrapi69/random/object/RandomObjectFactoryTest.java @@ -51,7 +51,7 @@ import io.github.astrapi69.test.object.EmployeeList; import io.github.astrapi69.test.object.Person; import io.github.astrapi69.test.object.PrimitiveArrays; -import io.github.astrapi69.test.object.enumtype.Gender; +import io.github.astrapi69.test.object.enumeration.Gender; /** * The unit test class for the class {@link RandomObjectFactory} @@ -262,7 +262,7 @@ public void testRandomEnumNull() @Test public void testRandomEnumString() { - String enumClassName = "io.github.astrapi69.test.object.enumtype.Gender"; + String enumClassName = "io.github.astrapi69.test.object.enumeration.Gender"; Gender randomEnumEntry = RandomObjectFactory.randomEnumFromClassname(enumClassName); final Gender[] genders = Gender.values(); @@ -433,6 +433,7 @@ public void testNewRandomObjectWithObject() throws IllegalAccessException, Person person2 = RandomObjectFactory.newRandomObject(person, "$jacocoData"); assertNotNull(person2); assertNotEquals(person, person2); + // TODO after update of test-object version uncomment PrimitiveArrays primitiveArrays = RandomObjectFactory.newRandomObject(PrimitiveArrays.class, "$jacocoData"); assertNotNull(primitiveArrays); diff --git a/src/test/java/io/github/astrapi69/random/object/RandomWebObjectFactoryTest.java b/src/test/java/io/github/astrapi69/random/object/RandomWebObjectFactoryTest.java index a6e626e..e357b10 100644 --- a/src/test/java/io/github/astrapi69/random/object/RandomWebObjectFactoryTest.java +++ b/src/test/java/io/github/astrapi69/random/object/RandomWebObjectFactoryTest.java @@ -35,8 +35,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import io.github.astrapi69.BaseTestCase; import io.github.astrapi69.random.RandomCharacters; +import io.github.astrapi69.test.base.BaseTestCase; /** * The unit test class for the class {@link RandomWebObjectFactory}.