#32 - Fix bugs in MemberDetails#isPersistable implementations

Author: sebersole

src/main/java/org/hibernate/models/internal/ModifierUtils.java

@@ -90,7 +90,7 @@ public static boolean isAbstract(int modifierFlags) {
 	 *
 	 * @see MemberDetails#isPersistable()
 	 */
-	public static boolean isPersistableField(int modifierFlags) {
+	public static boolean hasPersistableFieldModifiers(int modifierFlags) {
 		if ( isTransient( modifierFlags ) ) {
 			return false;
 		}
@@ -99,6 +99,10 @@ public static boolean isPersistableField(int modifierFlags) {
 			return false;
 		}
 
+		if ( ModifierUtils.isStatic( modifierFlags ) ) {
+			return false;
+		}
+
 		return true;
 	}
 
@@ -111,7 +115,7 @@ public static boolean isPersistableField(int modifierFlags) {
 	 *
 	 * @see MemberDetails#isPersistable()
 	 */
-	public static boolean isPersistableMethod(int modifierFlags) {
+	public static boolean hasPersistableMethodModifiers(int modifierFlags) {
 		if ( ModifierUtils.isStatic( modifierFlags ) ) {
 			return false;
 		}

src/main/java/org/hibernate/models/spi/FieldDetails.java

@@ -26,6 +26,6 @@ default String resolveAttributeName() {
 
 	@Override
 	default boolean isPersistable() {
-		return ModifierUtils.isPersistableField( getModifiers() );
+		return ModifierUtils.hasPersistableFieldModifiers( getModifiers() );
 	}
 }

src/main/java/org/hibernate/models/spi/MethodDetails.java

@@ -9,7 +9,7 @@
 import java.beans.Introspector;
 import java.util.List;
 
-import static org.hibernate.models.internal.ModifierUtils.isPersistableMethod;
+import static org.hibernate.models.internal.ModifierUtils.hasPersistableMethodModifiers;
 
 /**
  * Models a {@linkplain java.lang.reflect.Method method} in a {@linkplain ClassDetails class}.
@@ -36,19 +36,8 @@ default Kind getKind() {
 
 	@Override
 	default boolean isPersistable() {
-		if ( !getArgumentTypes().isEmpty() ) {
-			// should be the getter
-			return false;
-		}
-
-		if ( getReturnType() == null
-				|| "void".equals( getReturnType().getName() )
-				|| "Void".equals( getReturnType().getName() ) ) {
-			// again, should be the getter
-			return false;
-		}
-
-		return isPersistableMethod( getModifiers() );
+		return getMethodKind() == MethodKind.GETTER
+				&& hasPersistableMethodModifiers( getModifiers() );
 	}
 
 	@Override

src/test/java/org/hibernate/models/members/FieldDetailsTests.java

@@ -47,7 +47,7 @@ void verify(Index index) {
 				.getClassDetailsRegistry()
 				.findClassDetails( RandomClass.class.getName() );
 		assertThat( classDetails ).isNotNull();
-		assertThat( classDetails.getFields() ).hasSize( 10 );
+		assertThat( classDetails.getFields() ).hasSize( 12 );
 
 		final FieldDetails propertyField = classDetails.findFieldByName( "property" );
 		assertThat( propertyField.toJavaMember() ).isInstanceOf( Field.class );
@@ -121,6 +121,12 @@ void verify(Index index) {
 		assertThat( intValueArrayField.isPersistable() ).isTrue();
 		assertThat( intValueArrayField.getDeclaringType() ).isSameAs( classDetails );
 
+		final FieldDetails staticFieldField = classDetails.findFieldByName( "staticField" );
+		assertThat( staticFieldField.isPersistable() ).isFalse();
+
+		final FieldDetails transientFieldField = classDetails.findFieldByName( "transientField" );
+		assertThat( transientFieldField.isPersistable() ).isFalse();
+
 		classDetails.forEachField( (position, fieldDetails) -> {
 			System.out.printf( "  > Field (%s) : %s\n", position, fieldDetails );
 		} );
@@ -139,5 +145,8 @@ public static class RandomClass {
 		private double doubleValue;
 		float floatValue;
 		protected int[] intValueArray;
+
+		private static int staticField;
+		private transient int transientField;
 	}
 }

src/test/java/org/hibernate/models/members/MethodDetailsTests.java

@@ -149,6 +149,11 @@ else if ( method.getName().equals( "getIntArrayValue" ) ) {
 				assertThat( method.isPersistable() ).isTrue();
 				assertThat( method.getVisibility() ).isEqualTo( MemberDetails.Visibility.PUBLIC );
 			}
+			else if ( method.getName().equals( "somethingStatic" ) ) {
+				assertThat( method.getMethodKind() ).isEqualTo( MethodDetails.MethodKind.OTHER );
+				assertThat( method.isPersistable() ).isFalse();
+				assertThat( method.getVisibility() ).isEqualTo( MemberDetails.Visibility.PUBLIC );
+			}
 			else {
 				if ( ( (JdkMethodDetails) method ).getMethod().isSynthetic() ) {
 					// ignore it
@@ -177,5 +182,7 @@ public void setProperty(Integer id) {}
 
 		public void nothing() {}
 		public void something(Object stuff) {}
+
+		public static void somethingStatic() {}
 	}
 }

src/test/java/org/hibernate/models/members/RecordTests.java

@@ -9,6 +9,7 @@
 
 import org.hibernate.models.SourceModelTestHelper;
 import org.hibernate.models.internal.SourceModelBuildingContextImpl;
+import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.RecordComponentDetails;
 
@@ -48,6 +49,9 @@ void verify(Index index) {
 
 		for ( RecordComponentDetails recordComponent : classDetails.getRecordComponents() ) {
 			assertThat( recordComponent.getDeclaringType() ).isSameAs( classDetails );
+			assertThat( recordComponent.isPersistable() ).isTrue();
+			assertThat( recordComponent.getKind() ).isEqualTo( AnnotationTarget.Kind.RECORD_COMPONENT );
+			assertThat( recordComponent.resolveAttributeName() ).isEqualTo( recordComponent.getName() );
 		}
 	}