house keeping

Author: pfichtner

jmolecules-bytebuddy-tests/jmolecules-bytebuddy-tests-vaadoo/src/test/java/org/jmolecules/bytebuddy/JMoleculesVaadooPluginTests.java

@@ -26,7 +26,7 @@ class JMoleculesVaadooPluginTests {
 
 	@Test
 	void defaultsForSampleValueObject() throws Exception {
-		assertThat(SampleValueObject.class.getDeclaredMethod("__vaadoo$validate")).isNotNull();
+		assertThat(SampleValueObject.class.getDeclaredMethod("validate")).isNotNull();
 	}
 
 	@Test

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/VaadooImplementor.java

@@ -12,21 +12,26 @@
 import net.bytebuddy.dynamic.DynamicType.Builder;
 import net.bytebuddy.implementation.ExceptionMethod;
 import net.bytebuddy.implementation.MethodCall;
-import net.bytebuddy.implementation.StubMethod;
 import net.bytebuddy.implementation.SuperMethodCall;
 
 class VaadooImplementor {
 
-	private static final String VALIDATE_METHOD_NAME = "__vaadoo$validate";
+	private static final String VALIDATE_METHOD_NAME_1 = "validate";
+	private static final String VALIDATE_METHOD_NAME_2 = "__vaadoo$__validate";
 
 	JMoleculesTypeBuilder implementVaadoo(JMoleculesTypeBuilder type, Log log) {
-		String methodName = nonExistingMethodName(type, VALIDATE_METHOD_NAME);
+		String methodName = nonExistingMethodName(type);
 		return type //
 				.mapBuilder(t -> addValidationMethod(t, methodName))
 				.mapBuilder(t -> injectValidationIntoConstructors(t, methodName));
 	}
 
-	private static String nonExistingMethodName(JMoleculesTypeBuilder type, String baseMethodName) {
+	private static String nonExistingMethodName(JMoleculesTypeBuilder type) {
+		if (type.tryFindMethod(target -> isValidateMethod(target, VALIDATE_METHOD_NAME_1)) == null) {
+			return VALIDATE_METHOD_NAME_1;
+		}
+
+		String baseMethodName = VALIDATE_METHOD_NAME_2;
 		String methodName = baseMethodName;
 		for (int i = 0;; i++) {
 			final String currentName = methodName;
@@ -43,14 +48,8 @@ private static boolean isValidateMethod(InDefinedShape target, String methodName
 	}
 
 	private Builder<?> addValidationMethod(Builder<?> builder, String methodName) {
-	    return builder
-	        .defineMethod(methodName, void.class)
-	        .intercept(
-	            ExceptionMethod.throwing(
-	                IllegalStateException.class,
-	                "Vaadoo validation failed: override or disable this method"
-	            )
-	        );
+		return builder.defineMethod(methodName, void.class).intercept(ExceptionMethod
+				.throwing(IllegalStateException.class, "Vaadoo validation failed: override or disable this method"));
 	}
 
 	private Builder<?> injectValidationIntoConstructors(Builder<?> builder, String methodName) {