#74 - Add the ability to display a ClassDetails (including its MemberDetails) with its AnnotationUsages

sebersole · sebersole · commit e32410b94e2b · 2024-04-26T11:01:56.000-05:00
diff --git a/src/main/java/org/hibernate/models/internal/AbstractTypeDescriptor.java b/src/main/java/org/hibernate/models/internal/AbstractTypeDescriptor.java
@@ -10,6 +10,7 @@
 
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AttributeDescriptor;
+import org.hibernate.models.spi.RenderingCollector;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.ValueTypeDescriptor;
 import org.hibernate.models.spi.ValueWrapper;
@@ -42,6 +43,16 @@ public V createValue(
 		return valueWrapper.wrap( defaultValue, context );
 	}
 
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		collector.addLine( "%s = %s", name, attributeValue );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		collector.addLine( "%s = %s", attributeValue );
+	}
+
 	@Override
 	public String toString() {
 		return String.format(
diff --git a/src/main/java/org/hibernate/models/internal/ArrayTypeDescriptor.java b/src/main/java/org/hibernate/models/internal/ArrayTypeDescriptor.java
@@ -8,14 +8,13 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
-import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.models.internal.jandex.ArrayValueExtractor;
 import org.hibernate.models.internal.jandex.ArrayValueWrapper;
-import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AttributeDescriptor;
+import org.hibernate.models.spi.RenderingCollector;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.ValueExtractor;
 import org.hibernate.models.spi.ValueTypeDescriptor;
@@ -132,4 +131,28 @@ public Object unwrap(List<V> value) {
 		}
 		return result;
 	}
+
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		//noinspection unchecked
+		final List<V> values = (List<V>) attributeValue;
+
+		collector.addLine( "%s = {", name );
+		collector.indent( 2 );
+		values.forEach( (value) -> elementTypeDescriptor.render( collector, value ) );
+		collector.unindent( 2 );
+		collector.addLine( "}" );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		//noinspection unchecked
+		final List<V> values = (List<V>) attributeValue;
+
+		collector.addLine( "{" );
+		collector.indent( 2 );
+		values.forEach( (value) -> elementTypeDescriptor.render( collector, value ) );
+		collector.unindent( 2 );
+		collector.addLine( "}" );
+	}
 }
diff --git a/src/main/java/org/hibernate/models/internal/ClassTypeDescriptor.java b/src/main/java/org/hibernate/models/internal/ClassTypeDescriptor.java
@@ -11,6 +11,7 @@
 import org.hibernate.models.internal.jandex.ClassValueExtractor;
 import org.hibernate.models.internal.jandex.ClassValueWrapper;
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.RenderingCollector;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.ValueExtractor;
 import org.hibernate.models.spi.ValueWrapper;
@@ -55,4 +56,14 @@ public ValueExtractor<Annotation, ClassDetails> createJdkExtractor(SourceModelBu
 	public Object unwrap(ClassDetails value) {
 		return value.toJavaClass();
 	}
+
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		super.render( collector, name, ( (ClassDetails) attributeValue ).getName() );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		super.render( collector, ( (ClassDetails) attributeValue ).getName() );
+	}
 }
diff --git a/src/main/java/org/hibernate/models/internal/NestedTypeDescriptor.java b/src/main/java/org/hibernate/models/internal/NestedTypeDescriptor.java
@@ -14,6 +14,7 @@
 import org.hibernate.models.internal.jdk.AnnotationDescriptorImpl;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationUsage;
+import org.hibernate.models.spi.RenderingCollector;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.ValueExtractor;
 import org.hibernate.models.spi.ValueWrapper;
@@ -109,6 +110,20 @@ public ValueExtractor<Annotation, AnnotationUsage<A>> resolveJdkExtractor(Source
 		return jdkExtractor;
 	}
 
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		//noinspection unchecked
+		final AnnotationUsage<A> nested = (AnnotationUsage<A>) attributeValue;
+		nested.renderAttributeValue( name, collector );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		//noinspection unchecked
+		final AnnotationUsage<A> nested = (AnnotationUsage<A>) attributeValue;
+		nested.render( collector );
+	}
+
 	@Override
 	public String toString() {
 		return String.format(
diff --git a/src/main/java/org/hibernate/models/internal/StringTypeDescriptor.java b/src/main/java/org/hibernate/models/internal/StringTypeDescriptor.java
@@ -11,6 +11,7 @@
 import org.hibernate.models.internal.jandex.StringValueExtractor;
 import org.hibernate.models.internal.jandex.StringValueWrapper;
 import org.hibernate.models.internal.jdk.PassThruExtractor;
+import org.hibernate.models.spi.RenderingCollector;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.ValueExtractor;
 import org.hibernate.models.spi.ValueWrapper;
@@ -59,4 +60,14 @@ public ValueExtractor<Annotation, String> createJdkExtractor(SourceModelBuilding
 	public Object unwrap(String value) {
 		return value;
 	}
+
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		super.render( collector, name, "\"" + attributeValue + "\"" );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		super.render( collector, attributeValue );
+	}
 }
diff --git a/src/main/java/org/hibernate/models/spi/AnnotationUsage.java b/src/main/java/org/hibernate/models/spi/AnnotationUsage.java
@@ -153,4 +153,23 @@ default void render(RenderingCollector collector) {
 			collector.addLine( ")" );
 		}
 	}
+
+	default void renderAttributeValue(String name, RenderingCollector collector) {
+		final List<AttributeDescriptor<?>> attributes = getAnnotationDescriptor().getAttributes();
+		if ( attributes.isEmpty() ) {
+			collector.addLine( "%s = @%s", name, getAnnotationType().getName() );
+		}
+		else {
+			collector.addLine( "%s = @%s(", name, getAnnotationType().getName() );
+			collector.indent( 2 );
+			attributes.forEach( (attribute) -> attribute.getTypeDescriptor().render(
+					collector,
+					attribute.getName(),
+					getAttributeValue( attribute.getName() )
+			) );
+
+			collector.unindent( 2 );
+			collector.addLine( ")" );
+		}
+	}
 }
diff --git a/src/main/java/org/hibernate/models/spi/ValueTypeDescriptor.java b/src/main/java/org/hibernate/models/spi/ValueTypeDescriptor.java
@@ -46,4 +46,6 @@ public interface ValueTypeDescriptor<V> {
 	default void render(RenderingCollector collector, String name, Object attributeValue) {
 		collector.addLine( "%s=%s", name, "..." );
 	}
+
+	void render(RenderingCollector collector, Object attributeValue);
 }

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,6 @@ public interface ValueTypeDescriptor<V> {`
`46`	`46`	`default void render(RenderingCollector collector, String name, Object attributeValue) {`
`47`	`47`	`collector.addLine( "%s=%s", name, "..." );`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ void render(RenderingCollector collector, Object attributeValue);`
`49`	`51`	`}`