#37 - Improve MemberDetails#getElementType

Author: sebersole

src/main/java/org/hibernate/models/spi/CollectionElementSwitch.java renamed to src/main/java/org/hibernate/models/internal/CollectionElementSwitch.java

@@ -5,12 +5,18 @@
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
 
-package org.hibernate.models.spi;
+package org.hibernate.models.internal;
 
 import java.util.Collection;
 
-import org.hibernate.models.internal.TypeDetailsSwitchSupport;
-import org.hibernate.models.internal.TypeDetailsSwitcher;
+import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassTypeDetails;
+import org.hibernate.models.spi.ParameterizedTypeDetails;
+import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeVariableDetails;
+import org.hibernate.models.spi.TypeVariableReferenceDetails;
+import org.hibernate.models.spi.WildcardTypeDetails;
 
 /**
  * Used to determine the type details for a Collection element - see {@linkplain #extractCollectionElementType(TypeDetails)}
@@ -22,7 +28,6 @@ public class CollectionElementSwitch extends TypeDetailsSwitchSupport<TypeDetail
 	public static TypeDetails extractCollectionElementType(TypeDetails memberType) {
 		assert memberType.isImplementor( Collection.class );
 
-		// we may need to handle "concrete types" such as `class SpecialList implements List<String>`
 		final ClassDetails rawClassDetails = memberType.determineRawClass();
 		final CollectionElementSwitch collectionElementSwitch = new CollectionElementSwitch( memberType );
 

src/main/java/org/hibernate/models/spi/MapKeySwitch.java renamed to src/main/java/org/hibernate/models/internal/MapKeySwitch.java

@@ -5,12 +5,18 @@
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
 
-package org.hibernate.models.spi;
+package org.hibernate.models.internal;
 
 import java.util.Map;
 
-import org.hibernate.models.internal.TypeDetailsSwitchSupport;
-import org.hibernate.models.internal.TypeDetailsSwitcher;
+import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassTypeDetails;
+import org.hibernate.models.spi.ParameterizedTypeDetails;
+import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeVariableDetails;
+import org.hibernate.models.spi.TypeVariableReferenceDetails;
+import org.hibernate.models.spi.WildcardTypeDetails;
 
 /**
  * Used to determine the type details for a Map key - see {@linkplain #extractMapKeyType(TypeDetails)}
@@ -22,7 +28,6 @@ public class MapKeySwitch extends TypeDetailsSwitchSupport<TypeDetails> {
 	public static TypeDetails extractMapKeyType(TypeDetails memberType) {
 		assert memberType.isImplementor( Map.class );
 
-		// we may need to handle "concrete types" such as `class SpecialList implements List<String>`
 		final ClassDetails rawClassDetails = memberType.determineRawClass();
 		final MapKeySwitch mapKeySwitch = new MapKeySwitch( memberType );
 

src/main/java/org/hibernate/models/spi/MapValueSwitch.java renamed to src/main/java/org/hibernate/models/internal/MapValueSwitch.java

@@ -5,12 +5,18 @@
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
 
-package org.hibernate.models.spi;
+package org.hibernate.models.internal;
 
 import java.util.Map;
 
-import org.hibernate.models.internal.TypeDetailsSwitchSupport;
-import org.hibernate.models.internal.TypeDetailsSwitcher;
+import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassTypeDetails;
+import org.hibernate.models.spi.ParameterizedTypeDetails;
+import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.models.spi.TypeVariableDetails;
+import org.hibernate.models.spi.TypeVariableReferenceDetails;
+import org.hibernate.models.spi.WildcardTypeDetails;
 
 /**
  * Used to determine the type details for a Map value - see {@linkplain #extractMapValueType(TypeDetails)}
@@ -22,7 +28,6 @@ public class MapValueSwitch extends TypeDetailsSwitchSupport<TypeDetails> {
 	public static TypeDetails extractMapValueType(TypeDetails memberType) {
 		assert memberType.isImplementor( Map.class );
 
-		// we may need to handle "concrete types" such as `class SpecialList implements List<String>`
 		final ClassDetails rawClassDetails = memberType.determineRawClass();
 		final MapValueSwitch mapValueSwitch = new MapValueSwitch( memberType );
 

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

@@ -10,6 +10,9 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.hibernate.models.internal.CollectionElementSwitch;
+import org.hibernate.models.internal.MapKeySwitch;
+import org.hibernate.models.internal.MapValueSwitch;
 import org.hibernate.models.internal.ModifierUtils;
 
 /**
@@ -66,6 +69,7 @@ default TypeDetails getElementType() {
 
 		if ( memberType.isImplementor( Collection.class ) ) {
 			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// handle "concrete types" such as `class SpecialList implements List<String>`
 				return CollectionElementSwitch.extractCollectionElementType( memberType );
 			}
 			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
@@ -82,6 +86,7 @@ default TypeDetails getElementType() {
 
 		if ( memberType.isImplementor( Map.class ) ) {
 			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// handle "concrete types" such as `class SpecialMap implements Map<String,String>`
 				return MapValueSwitch.extractMapValueType( memberType );
 			}
 			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
@@ -111,6 +116,7 @@ default TypeDetails getMapKeyType() {
 
 		if ( memberType.isImplementor( Map.class ) ) {
 			if ( memberType.getTypeKind() == TypeDetails.Kind.CLASS ) {
+				// handle "concrete types" such as `class SpecialMap implements Map<String,String>`
 				return MapKeySwitch.extractMapKeyType( memberType );
 			}
 			if ( memberType.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {