HBX-2996 Create valid json objects for circular relationships

Author: mbellade

language/src/main/java/org/hibernate/tool/language/internal/JsonHelper.java

@@ -183,18 +183,13 @@ private static void entityToString(
 			JsonAppender appender) {
 		final EntityIdentifierMapping identifierMapping = entityType.getIdentifierMapping();
 		appender.trackingEntity( value, entityType, shouldProcessEntity -> {
+			appender.append( "{\"" ).append( identifierMapping.getAttributeName() ).append( "\":" );
+			entityIdentifierToString( value, identifierMapping, options, appender );
 			if ( shouldProcessEntity ) {
-				appender.append( "{\"" ).append( identifierMapping.getAttributeName() ).append( "\":" );
-				entityIdentifierToString( value, identifierMapping, options, appender );
+				// if it wasn't already encountered, append all properties
 				managedTypeToString( value, entityType, options, appender, ',' );
-				appender.append( '}' );
-			}
-			else {
-				// if it was already encountered, only append the identity string
-				appender.append( '\"' ).append( entityType.getEntityName() ).append( '#' );
-				entityIdentifierToString( value, identifierMapping, options, appender );
-				appender.append( '\"' );
 			}
+			appender.append( '}' );
 		} );
 	}
 

language/src/test/java/org/hibernate/tool/language/ResultsJsonSerializerTest.java

@@ -248,7 +248,10 @@ public void testCompanyFetchEmployees(SessionFactoryScope scope) {
 				employees.forEach( employee -> {
 					assertDoesNotThrow( () -> UUID.fromString( employee.get( "uniqueIdentifier" ).asText() ) );
 					assertThat( employee.get( "firstName" ).textValue() ).startsWith( "Ma" );
-					assertThat( employee.get( "company" ).textValue() ).isEqualTo( Company.class.getName() + "#1" );
+					final JsonNode company = employee.get( "company" );
+					assertThat( company.get( "id" ).intValue() ).isEqualTo( 1 );
+					assertThat( company.properties().stream().map( Map.Entry::getKey ) )
+							.containsOnly( "id" ); // circular relationship
 				} );
 			}
 			catch (JsonProcessingException e) {
@@ -348,8 +351,10 @@ public void testComplexInheritance(SessionFactoryScope scope) {
 				assertThat( cat.isObject() ).isTrue();
 				assertThat( cat.get( "id" ).intValue() ).isEqualTo( 2 );
 				assertThat( cat.get( "description" ).textValue() ).isEqualTo( "Gatta" );
-				assertThat( cat.get( "owner" ).isTextual() ).isTrue(); // circular relationship
-				assertThat( cat.get( "owner" ).textValue() ).isEqualTo( Human.class.getName() + "#1" );
+				final JsonNode owner = cat.get( "owner" );
+				assertThat( owner.get( "id" ).intValue() ).isEqualTo( 1 );
+				assertThat( owner.properties().stream().map( Map.Entry::getKey ) )
+						.containsOnly( "id" ); // circular relationship
 
 				final JsonNode nickNames = jsonNode.get( "nickNames" );
 				assertThat( nickNames.isArray() ).isTrue();