finalize the new extension API package: jakarta.enterprise.inject.bui…

…ld.spi
jakartaee · Oct 19, 2021 · fc49019 · fc49019
1 parent 94fe8fc
commit fc49019
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 36 deletions.
diff --git a/...ild/compatible/spi/AnnotationBuilder.java → ...e/inject/build/spi/AnnotationBuilder.java b/...ild/compatible/spi/AnnotationBuilder.java → ...e/inject/build/spi/AnnotationBuilder.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.AnnotationMember;

diff --git a/...patible/spi/AnnotationBuilderFactory.java → ...t/build/spi/AnnotationBuilderFactory.java b/...patible/spi/AnnotationBuilderFactory.java → ...t/build/spi/AnnotationBuilderFactory.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 

diff --git a/...inject/build/compatible/spi/BeanInfo.java → ...enterprise/inject/build/spi/BeanInfo.java b/...inject/build/compatible/spi/BeanInfo.java → ...enterprise/inject/build/spi/BeanInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;

diff --git a/...patible/spi/BuildCompatibleExtension.java → ...t/build/spi/BuildCompatibleExtension.java b/...patible/spi/BuildCompatibleExtension.java → ...t/build/spi/BuildCompatibleExtension.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 /**
  * Build compatible extensions are service providers for this interface, as defined in {@link java.util.ServiceLoader}.

diff --git a/...t/build/compatible/spi/BuildServices.java → ...prise/inject/build/spi/BuildServices.java b/...t/build/compatible/spi/BuildServices.java → ...prise/inject/build/spi/BuildServices.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.inject.spi.Prioritized;
 

diff --git a/...compatible/spi/BuildServicesResolver.java → ...ject/build/spi/BuildServicesResolver.java b/...compatible/spi/BuildServicesResolver.java → ...ject/build/spi/BuildServicesResolver.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.util.Collections;
 import java.util.Comparator;

diff --git a/...ect/build/compatible/spi/ClassConfig.java → ...erprise/inject/build/spi/ClassConfig.java b/...ect/build/compatible/spi/ClassConfig.java → ...erprise/inject/build/spi/ClassConfig.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;

diff --git a/...ild/compatible/spi/DeclarationConfig.java → ...e/inject/build/spi/DeclarationConfig.java b/...ild/compatible/spi/DeclarationConfig.java → ...e/inject/build/spi/DeclarationConfig.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.DeclarationInfo;

diff --git a/...nject/build/compatible/spi/Discovery.java → ...nterprise/inject/build/spi/Discovery.java b/...nject/build/compatible/spi/Discovery.java → ...nterprise/inject/build/spi/Discovery.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ct/build/compatible/spi/DisposerInfo.java → ...rprise/inject/build/spi/DisposerInfo.java b/...ct/build/compatible/spi/DisposerInfo.java → ...rprise/inject/build/spi/DisposerInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.declarations.MethodInfo;
 import jakarta.enterprise.lang.model.declarations.ParameterInfo;

diff --git a/...ect/build/compatible/spi/Enhancement.java → ...erprise/inject/build/spi/Enhancement.java b/...ect/build/compatible/spi/Enhancement.java → ...erprise/inject/build/spi/Enhancement.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

diff --git a/...ect/build/compatible/spi/FieldConfig.java → ...erprise/inject/build/spi/FieldConfig.java b/...ect/build/compatible/spi/FieldConfig.java → ...erprise/inject/build/spi/FieldConfig.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.FieldInfo;

diff --git a/...ld/compatible/spi/InjectionPointInfo.java → .../inject/build/spi/InjectionPointInfo.java b/...ld/compatible/spi/InjectionPointInfo.java → .../inject/build/spi/InjectionPointInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.DeclarationInfo;

diff --git a/...build/compatible/spi/InterceptorInfo.java → ...ise/inject/build/spi/InterceptorInfo.java b/...build/compatible/spi/InterceptorInfo.java → ...ise/inject/build/spi/InterceptorInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.inject.spi.InterceptionType;
 import jakarta.enterprise.lang.model.AnnotationInfo;

diff --git a/...inject/build/compatible/spi/Messages.java → ...enterprise/inject/build/spi/Messages.java b/...inject/build/compatible/spi/Messages.java → ...enterprise/inject/build/spi/Messages.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationTarget;
 

diff --git a/...build/compatible/spi/MetaAnnotations.java → ...ise/inject/build/spi/MetaAnnotations.java b/...build/compatible/spi/MetaAnnotations.java → ...ise/inject/build/spi/MetaAnnotations.java
@@ -1,9 +1,8 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.context.spi.AlterableContext;
 
 import java.lang.annotation.Annotation;
-import java.util.function.Consumer;
 
 /**
  * Allows registering custom CDI meta-annotations: qualifiers, interceptor bindings,

diff --git a/...ct/build/compatible/spi/MethodConfig.java → ...rprise/inject/build/spi/MethodConfig.java b/...ct/build/compatible/spi/MethodConfig.java → ...rprise/inject/build/spi/MethodConfig.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.MethodInfo;

diff --git a/...ct/build/compatible/spi/ObserverInfo.java → ...rprise/inject/build/spi/ObserverInfo.java b/...ct/build/compatible/spi/ObserverInfo.java → ...rprise/inject/build/spi/ObserverInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;

diff --git a/...build/compatible/spi/ParameterConfig.java → ...ise/inject/build/spi/ParameterConfig.java b/...build/compatible/spi/ParameterConfig.java → ...ise/inject/build/spi/ParameterConfig.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ParameterInfo;

diff --git a/...ject/build/compatible/spi/Parameters.java → ...terprise/inject/build/spi/Parameters.java b/...ject/build/compatible/spi/Parameters.java → ...terprise/inject/build/spi/Parameters.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 /**
  * A {@code String}-keyed parameter map. The parameter mappings are defined

diff --git a/...ct/build/compatible/spi/Registration.java → ...rprise/inject/build/spi/Registration.java b/...ct/build/compatible/spi/Registration.java → ...rprise/inject/build/spi/Registration.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../build/compatible/spi/ScannedClasses.java → ...rise/inject/build/spi/ScannedClasses.java b/.../build/compatible/spi/ScannedClasses.java → ...rise/inject/build/spi/ScannedClasses.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 /**
  * Allows registering additional classes to be scanned during bean discovery.

diff --git a/...nject/build/compatible/spi/ScopeInfo.java → ...nterprise/inject/build/spi/ScopeInfo.java b/...nject/build/compatible/spi/ScopeInfo.java → ...nterprise/inject/build/spi/ScopeInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 

diff --git a/...build/compatible/spi/SecurityActions.java → ...ise/inject/build/spi/SecurityActions.java b/...build/compatible/spi/SecurityActions.java → ...ise/inject/build/spi/SecurityActions.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

diff --git a/...e/spi/SkipIfPortableExtensionPresent.java → ...d/spi/SkipIfPortableExtensionPresent.java b/...e/spi/SkipIfPortableExtensionPresent.java → ...d/spi/SkipIfPortableExtensionPresent.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../build/compatible/spi/StereotypeInfo.java → ...rise/inject/build/spi/StereotypeInfo.java b/.../build/compatible/spi/StereotypeInfo.java → ...rise/inject/build/spi/StereotypeInfo.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import java.util.Collection;

diff --git a/...nject/build/compatible/spi/Synthesis.java → ...nterprise/inject/build/spi/Synthesis.java b/...nject/build/compatible/spi/Synthesis.java → ...nterprise/inject/build/spi/Synthesis.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../compatible/spi/SyntheticBeanBuilder.java → ...nject/build/spi/SyntheticBeanBuilder.java b/.../compatible/spi/SyntheticBeanBuilder.java → ...nject/build/spi/SyntheticBeanBuilder.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.AnnotationInfo;
 import jakarta.enterprise.lang.model.declarations.ClassInfo;

diff --git a/.../compatible/spi/SyntheticBeanCreator.java → ...nject/build/spi/SyntheticBeanCreator.java b/.../compatible/spi/SyntheticBeanCreator.java → ...nject/build/spi/SyntheticBeanCreator.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.inject.Instance;
 

diff --git a/...compatible/spi/SyntheticBeanDisposer.java → ...ject/build/spi/SyntheticBeanDisposer.java b/...compatible/spi/SyntheticBeanDisposer.java → ...ject/build/spi/SyntheticBeanDisposer.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.inject.Instance;
 

diff --git a/...d/compatible/spi/SyntheticComponents.java → ...inject/build/spi/SyntheticComponents.java b/...d/compatible/spi/SyntheticComponents.java → ...inject/build/spi/SyntheticComponents.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 /**
  * Allows registering synthetic beans and observers.

diff --git a/...ild/compatible/spi/SyntheticObserver.java → ...e/inject/build/spi/SyntheticObserver.java b/...ild/compatible/spi/SyntheticObserver.java → ...e/inject/build/spi/SyntheticObserver.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.event.ObserverException;
 import jakarta.enterprise.inject.spi.EventContext;

diff --git a/...patible/spi/SyntheticObserverBuilder.java → ...t/build/spi/SyntheticObserverBuilder.java b/...patible/spi/SyntheticObserverBuilder.java → ...t/build/spi/SyntheticObserverBuilder.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.event.TransactionPhase;
 import jakarta.enterprise.lang.model.AnnotationInfo;

diff --git a/...se/inject/build/compatible/spi/Types.java → ...ta/enterprise/inject/build/spi/Types.java b/...se/inject/build/compatible/spi/Types.java → ...ta/enterprise/inject/build/spi/Types.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import jakarta.enterprise.lang.model.declarations.ClassInfo;
 import jakarta.enterprise.lang.model.types.ArrayType;

diff --git a/...ject/build/compatible/spi/Validation.java → ...terprise/inject/build/spi/Validation.java b/...ject/build/compatible/spi/Validation.java → ...terprise/inject/build/spi/Validation.java
@@ -1,4 +1,4 @@
-package jakarta.enterprise.inject.build.compatible.spi;
+package jakarta.enterprise.inject.build.spi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;