#77 - Fix bug in rendering code

Author: sebersole

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

@@ -50,7 +50,7 @@ public void render(RenderingCollector collector, String name, Object attributeVa
 
 	@Override
 	public void render(RenderingCollector collector, Object attributeValue) {
-		collector.addLine( "%s = %s", attributeValue );
+		collector.addLine( "%s", attributeValue );
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@
 import org.hibernate.models.internal.jandex.FloatValueExtractor;
 import org.hibernate.models.internal.jandex.FloatValueWrapper;
 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, Float> createJdkExtractor(SourceModelBuildingC
 	public Object unwrap(Float value) {
 		return value;
 	}
+
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		collector.addLine( "%s = %sF", name, attributeValue );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		collector.addLine( "%sF", attributeValue );
+	}
 }

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

@@ -11,6 +11,7 @@
 import org.hibernate.models.internal.jandex.LongValueExtractor;
 import org.hibernate.models.internal.jandex.LongValueWrapper;
 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, Long> createJdkExtractor(SourceModelBuildingCo
 	public Object unwrap(Long value) {
 		return value;
 	}
+
+	@Override
+	public void render(RenderingCollector collector, String name, Object attributeValue) {
+		collector.addLine( "%s = %sL", name, attributeValue );
+	}
+
+	@Override
+	public void render(RenderingCollector collector, Object attributeValue) {
+		collector.addLine( "%sL", attributeValue );
+	}
 }

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

@@ -63,11 +63,11 @@ public Object unwrap(String value) {
 
 	@Override
 	public void render(RenderingCollector collector, String name, Object attributeValue) {
-		super.render( collector, name, "\"" + attributeValue + "\"" );
+		collector.addLine( "%s = \"%s\"", name, attributeValue );
 	}
 
 	@Override
 	public void render(RenderingCollector collector, Object attributeValue) {
-		super.render( collector, attributeValue );
+		collector.addLine( "\"%s\"", attributeValue );
 	}
 }

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

@@ -17,6 +17,7 @@
 
 import org.hibernate.models.AnnotationAccessException;
 import org.hibernate.models.IllegalCastException;
+import org.hibernate.models.internal.RenderingCollectorImpl;
 
 /**
  * Abstract for something where an annotation can be {@linkplain AnnotationUsage used}.
@@ -328,6 +329,12 @@ default <T, A extends Annotation> T fromAnnotations(
 
 	void render();
 
+	default String renderToString() {
+		final RenderingCollectorImpl renderingCollector = new RenderingCollectorImpl();
+		render( renderingCollector );
+		return renderingCollector.toString();
+	}
+
 	void render(RenderingCollector collector);
 
 	/**

src/test/java/org/hibernate/models/RenderingSmokeTest.java

@@ -7,7 +7,11 @@
 
 package org.hibernate.models;
 
+import org.hibernate.models.annotations.AttributeAccessTests;
+import org.hibernate.models.annotations.EverythingBagel;
+import org.hibernate.models.annotations.Nested;
 import org.hibernate.models.annotations.SimpleEntity;
+import org.hibernate.models.annotations.Status;
 import org.hibernate.models.internal.SourceModelBuildingContextImpl;
 import org.hibernate.models.spi.ClassDetails;
 
@@ -25,8 +29,34 @@ public class RenderingSmokeTest {
 	void testRendering() {
 		final SourceModelBuildingContextImpl buildingContext = createBuildingContext( (Index) null, SimpleEntity.class );
 
-		final ClassDetails classDetails = buildingContext.getClassDetailsRegistry()
-				.resolveClassDetails( SimpleEntity.class.getName() );
+		final ClassDetails classDetails = buildingContext.getClassDetailsRegistry().resolveClassDetails( SimpleEntity.class.getName() );
 		classDetails.render();
 	}
+
+	@Test
+	void testRendering2() {
+		final SourceModelBuildingContextImpl buildingContext = createBuildingContext( (org.jboss.jandex.Index) null, SimpleClass.class );
+		final ClassDetails classDetails = buildingContext.getClassDetailsRegistry().resolveClassDetails( SimpleClass.class.getName() );
+
+		System.out.println( classDetails.renderToString() );
+	}
+
+
+	@EverythingBagel(
+			theString = "hello",
+			theEnum = Status.ACTIVE,
+			theBoolean = true,
+			theByte = 1,
+			theShort = 2,
+			theInteger = 3,
+			theLong = 4L,
+			theFloat = 5.1F,
+			theDouble = 6.2,
+			theClass = AttributeAccessTests.TheClass.class,
+			theNested = @Nested(),
+			theNesteds = {@Nested(), @Nested()},
+			theStrings = {"a", "b", "c"}
+	)
+	public static class SimpleClass {
+	}
 }

src/test/java/org/hibernate/models/annotations/AttributeAccessTests.java

@@ -7,11 +7,6 @@
 
 package org.hibernate.models.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 import org.hibernate.models.internal.SourceModelBuildingContextImpl;
 import org.hibernate.models.spi.AnnotationUsage;
 import org.hibernate.models.spi.ClassDetails;
@@ -71,33 +66,11 @@ void testAttributeAccess() {
 			theDouble = 6.2,
 			theClass = TheClass.class,
 			theNested = @Nested(),
+			theNesteds = {@Nested(), @Nested()},
 			theStrings = {"a", "b", "c"}
 	)
 	public static class TheClass {
 
 	}
 
-	public enum Status { ACTIVE }
-
-	@Target(ElementType.TYPE)
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface Nested {
-	}
-
-	@Target(ElementType.TYPE)
-	@Retention(RetentionPolicy.RUNTIME)
-	public @interface EverythingBagel {
-		String theString();
-		Status theEnum();
-		boolean theBoolean();
-		byte theByte();
-		short theShort();
-		int theInteger();
-		long theLong();
-		float theFloat();
-		double theDouble();
-		Class<?> theClass();
-		Nested theNested();
-		String[] theStrings();
-	}
 }

src/test/java/org/hibernate/models/annotations/EverythingBagel.java

@@ -0,0 +1,46 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+
+package org.hibernate.models.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Steve Ebersole
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EverythingBagel {
+	String theString();
+
+	Status theEnum();
+
+	boolean theBoolean();
+
+	byte theByte();
+
+	short theShort();
+
+	int theInteger();
+
+	long theLong();
+
+	float theFloat();
+
+	double theDouble();
+
+	Class<?> theClass();
+
+	Nested theNested();
+
+	Nested[] theNesteds();
+
+	String[] theStrings();
+}

src/test/java/org/hibernate/models/annotations/Nested.java

@@ -0,0 +1,21 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+
+package org.hibernate.models.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Steve Ebersole
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nested {
+}

src/test/java/org/hibernate/models/annotations/Status.java

@@ -0,0 +1,13 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+
+package org.hibernate.models.annotations;
+
+/**
+ * @author Steve Ebersole
+ */
+public enum Status {ACTIVE}