#28 - Expose mutable forms of some contracts as spi

sebersole · sebersole · commit 1ae1a41662c7 · 2024-02-08T14:27:30.000-06:00
diff --git a/src/main/java/org/hibernate/models/internal/AnnotationTargetSupport.java b/src/main/java/org/hibernate/models/internal/AnnotationTargetSupport.java
@@ -16,6 +16,7 @@
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.spi.AnnotationUsage;
+import org.hibernate.models.spi.MutableAnnotationTarget;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
 /**
@@ -116,7 +117,6 @@ default <X extends Annotation> void forEachAnnotationUsage(Class<X> type, Consum
 
 	@Override
 	default <A extends Annotation> List<AnnotationUsage<? extends Annotation>> getMetaAnnotated(Class<A> metaAnnotationType) {
-		final AnnotationDescriptorRegistry descriptorRegistry = getBuildingContext().getAnnotationDescriptorRegistry();
 		final List<AnnotationUsage<?>> usages = new ArrayList<>();
 		forAllAnnotationUsages( (usage) -> {
 			final AnnotationUsage<? extends Annotation> metaUsage = usage.getAnnotationDescriptor().getAnnotationUsage( metaAnnotationType );
diff --git a/src/main/java/org/hibernate/models/internal/AnnotationUsageHelper.java b/src/main/java/org/hibernate/models/internal/AnnotationUsageHelper.java
@@ -64,7 +64,7 @@ public static <A extends Annotation> AnnotationUsage<A> getUsage(
 
 	public static <A extends Annotation> List<AnnotationUsage<A>> getRepeatedUsages(
 			AnnotationDescriptor<A> type,
-			Map<Class<? extends Annotation>, AnnotationUsage<?>> usageMap) {
+			Map<Class<? extends Annotation>, AnnotationUsage<? extends Annotation>> usageMap) {
 		// e.g. `@NamedQuery`
 		final AnnotationUsage<A> usage = findUsage( type, usageMap );
 		// e.g. `@NamedQueries`
diff --git a/src/main/java/org/hibernate/models/internal/ClassDetailsSupport.java b/src/main/java/org/hibernate/models/internal/ClassDetailsSupport.java
@@ -15,6 +15,8 @@
 import org.hibernate.models.spi.AnnotationUsage;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.MethodDetails;
+import org.hibernate.models.spi.MutableAnnotationTarget;
+import org.hibernate.models.spi.MutableClassDetails;
 
 /**
  * @author Steve Ebersole
diff --git a/src/main/java/org/hibernate/models/internal/dynamic/DynamicFieldDetails.java b/src/main/java/org/hibernate/models/internal/dynamic/DynamicFieldDetails.java
@@ -10,13 +10,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 /**
  * @author Steve Ebersole
diff --git a/src/main/java/org/hibernate/models/internal/dynamic/DynamicMethodDetails.java b/src/main/java/org/hibernate/models/internal/dynamic/DynamicMethodDetails.java
@@ -11,13 +11,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 /**
  * @author Steve Ebersole
diff --git a/src/main/java/org/hibernate/models/internal/dynamic/MapModeFieldDetails.java b/src/main/java/org/hibernate/models/internal/dynamic/MapModeFieldDetails.java
diff --git a/src/main/java/org/hibernate/models/internal/jandex/JandexFieldDetails.java b/src/main/java/org/hibernate/models/internal/jandex/JandexFieldDetails.java
@@ -11,13 +11,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.FieldInfo;
diff --git a/src/main/java/org/hibernate/models/internal/jandex/JandexMethodDetails.java b/src/main/java/org/hibernate/models/internal/jandex/JandexMethodDetails.java
@@ -13,7 +13,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassBasedTypeDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
diff --git a/src/main/java/org/hibernate/models/internal/jandex/JandexRecordComponentDetails.java b/src/main/java/org/hibernate/models/internal/jandex/JandexRecordComponentDetails.java
@@ -10,13 +10,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.RecordComponentDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.RecordComponentInfo;
diff --git a/src/main/java/org/hibernate/models/internal/jdk/JdkFieldDetails.java b/src/main/java/org/hibernate/models/internal/jdk/JdkFieldDetails.java
@@ -10,13 +10,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 
 /**
diff --git a/src/main/java/org/hibernate/models/internal/jdk/JdkMethodDetails.java b/src/main/java/org/hibernate/models/internal/jdk/JdkMethodDetails.java
@@ -13,7 +13,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassBasedTypeDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
diff --git a/src/main/java/org/hibernate/models/internal/jdk/JdkRecordComponentDetails.java b/src/main/java/org/hibernate/models/internal/jdk/JdkRecordComponentDetails.java
@@ -12,13 +12,11 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.models.internal.MutableMemberDetails;
-import org.hibernate.models.spi.ClassBasedTypeDetails;
+import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.RecordComponentDetails;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeDetailsHelper;
 
 /**
  * @author Steve Ebersole
diff --git a/src/main/java/org/hibernate/models/spi/MutableAnnotationTarget.java b/src/main/java/org/hibernate/models/spi/MutableAnnotationTarget.java
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.internal;
+package org.hibernate.models.spi;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import org.hibernate.models.spi.AnnotationTarget;
-import org.hibernate.models.spi.AnnotationUsage;
-
 /**
+ * Extension of AnnotationTarget which allows manipulation of the annotations
+ *
  * @author Steve Ebersole
  */
 public interface MutableAnnotationTarget extends AnnotationTarget {
diff --git a/src/main/java/org/hibernate/models/spi/MutableClassDetails.java b/src/main/java/org/hibernate/models/spi/MutableClassDetails.java
@@ -4,13 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.internal;
-
-import org.hibernate.models.spi.ClassDetails;
-import org.hibernate.models.spi.FieldDetails;
-import org.hibernate.models.spi.MethodDetails;
+package org.hibernate.models.spi;
 
 /**
+ * Extension of ClassDetails which allows manipulation of the members
+ *
  * @author Steve Ebersole
  */
 public interface MutableClassDetails extends ClassDetails, MutableAnnotationTarget {
diff --git a/src/main/java/org/hibernate/models/spi/MutableMemberDetails.java b/src/main/java/org/hibernate/models/spi/MutableMemberDetails.java
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.internal;
-
-import org.hibernate.models.spi.MemberDetails;
+package org.hibernate.models.spi;
 
 /**
+ * Union of MemberDetails and MutableAnnotationTarget
+ *
  * @author Steve Ebersole
  */
 public interface MutableMemberDetails extends MemberDetails, MutableAnnotationTarget {
