#76 - Fix NPE stemming from bug in replaceAnnotationUsage

hibernate · Apr 26, 2024 · ad8f7a4 · ad8f7a4
1 parent 3594aa8
commit ad8f7a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/hibernate/models/internal/AnnotationTargetSupport.java b/src/main/java/org/hibernate/models/internal/AnnotationTargetSupport.java
@@ -163,7 +163,8 @@ default <S extends Annotation, P extends Annotation> MutableAnnotationUsage<P> r
 		final MutableAnnotationUsage<P> containerTypeUsage = containerType.createUsage( buildingContext );
 		// effectively overwrites any previous registrations
 		getUsageMap().put( containerType.getAnnotationType(), containerTypeUsage );
-		getUsageMap().put( repeatableType.getAnnotationType(), null );
+		// remove any entry for the repeatable/singular form
+		getUsageMap().remove( repeatableType.getAnnotationType() );
 
 		return containerTypeUsage;
 	}

diff --git a/src/test/java/org/hibernate/models/annotations/AnnotationReplacementTests.java b/src/test/java/org/hibernate/models/annotations/AnnotationReplacementTests.java
@@ -57,7 +57,7 @@ void basicReplacementChecks(Index index) {
 				buildingContext
 		);
 
-		assertThat( classDetails.hasAnnotationUsage( SecondaryTable.class ) ).isTrue();
+		assertThat( classDetails.hasAnnotationUsage( SecondaryTable.class ) ).isFalse();
 		assertThat( classDetails.hasAnnotationUsage( SecondaryTables.class ) ).isTrue();
 
 		List<MutableAnnotationUsage<SecondaryTable>> valueList = replacement.getList( "value" );
@@ -75,6 +75,9 @@ void basicReplacementChecks(Index index) {
 
 		final AnnotationUsage<SecondaryTables> annotationUsage1 = classDetails.getAnnotationUsage( SecondaryTables.class );
 		assertThat( annotationUsage1.getList( "value" ) ).isSameAs( valueList );
+
+		// see #76
+		classDetails.locateAnnotationUsage( SecondaryTable.class );
 	}
 
 }