From 8842e9d8e1d9a9190b0136e85abaeb48b00ef4f3 Mon Sep 17 00:00:00 2001 From: tueem Date: Fri, 11 Apr 2025 12:16:58 +0200 Subject: [PATCH] refactor(method): move Method related classes to method package --- .../java/net/tomatentum/cutin/ReflectedMethodFactory.java | 2 ++ .../java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java | 1 + .../net/tomatentum/cutin/container/LoneMethodContainer.java | 2 +- .../java/net/tomatentum/cutin/container/MethodContainer.java | 2 +- .../net/tomatentum/cutin/container/MultiMethodContainer.java | 2 +- .../tomatentum/cutin/{ => method}/BestCandidateMethod.java | 4 ++-- .../net/tomatentum/cutin/{ => method}/ReflectedMethod.java | 2 +- .../test/java/net/tomatentum/cutin/ReflectedMethodTest.java | 3 +++ .../test/java/net/tomatentum/cutin/TestReflectedMethod.java | 2 ++ 9 files changed, 14 insertions(+), 6 deletions(-) rename lib/src/main/java/net/tomatentum/cutin/{ => method}/BestCandidateMethod.java (91%) rename lib/src/main/java/net/tomatentum/cutin/{ => method}/ReflectedMethod.java (98%) diff --git a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactory.java b/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactory.java index 939961b..1c1338b 100644 --- a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactory.java +++ b/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactory.java @@ -4,6 +4,8 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Optional; +import net.tomatentum.cutin.method.ReflectedMethod; + public interface ReflectedMethodFactory { Optional> produce(Method method, Object containingClass); diff --git a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java b/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java index f2b5c87..431e8f5 100644 --- a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java +++ b/lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java @@ -8,6 +8,7 @@ import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import net.tomatentum.cutin.method.ReflectedMethod; import net.tomatentum.cutin.util.ReflectionUtil; diff --git a/lib/src/main/java/net/tomatentum/cutin/container/LoneMethodContainer.java b/lib/src/main/java/net/tomatentum/cutin/container/LoneMethodContainer.java index a2f2050..a06f10b 100644 --- a/lib/src/main/java/net/tomatentum/cutin/container/LoneMethodContainer.java +++ b/lib/src/main/java/net/tomatentum/cutin/container/LoneMethodContainer.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import net.tomatentum.cutin.ReflectedMethod; import net.tomatentum.cutin.ReflectedMethodFactory; +import net.tomatentum.cutin.method.ReflectedMethod; public class LoneMethodContainer implements MethodContainer { diff --git a/lib/src/main/java/net/tomatentum/cutin/container/MethodContainer.java b/lib/src/main/java/net/tomatentum/cutin/container/MethodContainer.java index 81c0353..efbde45 100644 --- a/lib/src/main/java/net/tomatentum/cutin/container/MethodContainer.java +++ b/lib/src/main/java/net/tomatentum/cutin/container/MethodContainer.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.Optional; import java.util.Set; -import net.tomatentum.cutin.ReflectedMethod; +import net.tomatentum.cutin.method.ReflectedMethod; public interface MethodContainer { diff --git a/lib/src/main/java/net/tomatentum/cutin/container/MultiMethodContainer.java b/lib/src/main/java/net/tomatentum/cutin/container/MultiMethodContainer.java index 7cb09e1..327d8e5 100644 --- a/lib/src/main/java/net/tomatentum/cutin/container/MultiMethodContainer.java +++ b/lib/src/main/java/net/tomatentum/cutin/container/MultiMethodContainer.java @@ -10,8 +10,8 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.tomatentum.cutin.ReflectedMethod; import net.tomatentum.cutin.ReflectedMethodFactory; +import net.tomatentum.cutin.method.ReflectedMethod; import net.tomatentum.cutin.util.ReflectionUtil; public class MultiMethodContainer implements MethodContainer { diff --git a/lib/src/main/java/net/tomatentum/cutin/BestCandidateMethod.java b/lib/src/main/java/net/tomatentum/cutin/method/BestCandidateMethod.java similarity index 91% rename from lib/src/main/java/net/tomatentum/cutin/BestCandidateMethod.java rename to lib/src/main/java/net/tomatentum/cutin/method/BestCandidateMethod.java index 2f468d8..4d629e9 100644 --- a/lib/src/main/java/net/tomatentum/cutin/BestCandidateMethod.java +++ b/lib/src/main/java/net/tomatentum/cutin/method/BestCandidateMethod.java @@ -1,4 +1,4 @@ -package net.tomatentum.cutin; +package net.tomatentum.cutin.method; import java.lang.reflect.Method; import java.util.Arrays; @@ -13,7 +13,7 @@ public class BestCandidateMethod extends ReflectedMethod { private I identifier; private List additionalParameters; - protected BestCandidateMethod(String methodName, Object containingObject, I identifer, Object... additionalParameters) { + public BestCandidateMethod(String methodName, Object containingObject, I identifer, Object... additionalParameters) { super(getMethod(containingObject, methodName), containingObject); this.methodName = methodName; this.identifier = identifer; diff --git a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethod.java b/lib/src/main/java/net/tomatentum/cutin/method/ReflectedMethod.java similarity index 98% rename from lib/src/main/java/net/tomatentum/cutin/ReflectedMethod.java rename to lib/src/main/java/net/tomatentum/cutin/method/ReflectedMethod.java index 44840c1..d8c4fdd 100644 --- a/lib/src/main/java/net/tomatentum/cutin/ReflectedMethod.java +++ b/lib/src/main/java/net/tomatentum/cutin/method/ReflectedMethod.java @@ -1,4 +1,4 @@ -package net.tomatentum.cutin; +package net.tomatentum.cutin.method; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/lib/src/test/java/net/tomatentum/cutin/ReflectedMethodTest.java b/lib/src/test/java/net/tomatentum/cutin/ReflectedMethodTest.java index 18076f6..dfa66d6 100644 --- a/lib/src/test/java/net/tomatentum/cutin/ReflectedMethodTest.java +++ b/lib/src/test/java/net/tomatentum/cutin/ReflectedMethodTest.java @@ -4,6 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; +import net.tomatentum.cutin.method.BestCandidateMethod; +import net.tomatentum.cutin.method.ReflectedMethod; + class ReflectedMethodTest { @Test diff --git a/lib/src/test/java/net/tomatentum/cutin/TestReflectedMethod.java b/lib/src/test/java/net/tomatentum/cutin/TestReflectedMethod.java index efee2eb..d18c140 100644 --- a/lib/src/test/java/net/tomatentum/cutin/TestReflectedMethod.java +++ b/lib/src/test/java/net/tomatentum/cutin/TestReflectedMethod.java @@ -2,6 +2,8 @@ package net.tomatentum.cutin; import java.lang.reflect.Method; +import net.tomatentum.cutin.method.ReflectedMethod; + public class TestReflectedMethod extends ReflectedMethod { protected TestReflectedMethod(Object containingObject) {