don't need prism module

avaje · Feb 7, 2023 · d09c0e2 · d09c0e2
1 parent b23e7f0
commit d09c0e2
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 164 deletions.
diff --git a/inject-generator/pom.xml b/inject-generator/pom.xml
@@ -19,12 +19,13 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-inject-prism</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
+		<dependency>
+			<groupId>com.jolira</groupId>
+			<artifactId>hickory</artifactId>
+			<version>1.0.0</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -47,9 +48,15 @@
         <configuration>
           <source>11</source>
           <target>11</target>
-          <compilerArgument>-proc:none</compilerArgument>
-        </configuration>
-      </plugin>
+		  <annotationProcessorPaths>
+		  	<annotationProcessorPath>
+		  		<groupId>com.jolira</groupId>
+				<artifactId>hickory</artifactId>
+				<version>1.0.0</version>
+		  	</annotationProcessorPath>
+		  </annotationProcessorPaths>
+		</configuration>
+	  </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java b/inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java
@@ -8,7 +8,6 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import io.avaje.inject.prism.InjectModulePrism;
 
 final class AllScopes {
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/AspectAnnotationReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/AspectAnnotationReader.java
@@ -3,8 +3,6 @@
 
 import javax.lang.model.element.*;
 
-import io.avaje.inject.prism.AspectPrism;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java
@@ -9,10 +9,6 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import io.avaje.inject.prism.PrimaryPrism;
-import io.avaje.inject.prism.PrototypePrism;
-import io.avaje.inject.prism.ProxyPrism;
-import io.avaje.inject.prism.SecondaryPrism;
 
 final class BeanReader {
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/MetaData.java b/inject-generator/src/main/java/io/avaje/inject/generator/MetaData.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import io.avaje.inject.prism.DependencyMetaPrism;
 
 /**
  * Holds the data as per <code>@DependencyMeta</code>

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java
@@ -11,10 +11,6 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 
-import io.avaje.inject.prism.BeanPrism;
-import io.avaje.inject.prism.PrimaryPrism;
-import io.avaje.inject.prism.PrototypePrism;
-import io.avaje.inject.prism.SecondaryPrism;
 
 final class MethodReader {
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java b/inject-generator/src/main/java/io/avaje/inject/generator/Processor.java
@@ -22,8 +22,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 import javax.tools.StandardLocation;
-import io.avaje.inject.prism.InjectModulePrism;
-import io.avaje.inject.prism.ScopePrism;
 
 
 @SupportedAnnotationTypes({

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java b/inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java
@@ -17,8 +17,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.JavaFileObject;
 
-import io.avaje.inject.prism.DependencyMetaPrism;
-import io.avaje.inject.prism.InjectModulePrism;
 
 final class ScopeInfo {
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java
@@ -5,7 +5,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 
-import io.avaje.inject.prism.QualifierPrism;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java
@@ -1,8 +1,5 @@
 package io.avaje.inject.generator;
 
-import io.avaje.inject.prism.BeanPrism;
-import io.avaje.inject.prism.InjectPrism;
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java
@@ -11,10 +11,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-import io.avaje.inject.prism.FactoryPrism;
-import io.avaje.inject.prism.GeneratedPrism;
-import io.avaje.inject.prism.ProxyPrism;
-
 /**
  * Read the inheritance types for a given bean type.
  */

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java b/inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java
@@ -4,8 +4,6 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import io.avaje.inject.prism.NamedPrism;
-
 import java.util.List;
 import java.util.Set;
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java
@@ -5,9 +5,6 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import io.avaje.inject.prism.NamedPrism;
-import io.avaje.inject.prism.QualifierPrism;
-
 final class Util {
 
   static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<";

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java b/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java
@@ -1 +1,37 @@
+@net.java.dev.hickory.prism.GeneratePrisms({
+  @GeneratePrism(value = InjectModule.class, publicAccess = true),
+  @GeneratePrism(value = Factory.class, publicAccess = true),
+  @GeneratePrism(value = Singleton.class, publicAccess = true),
+  @GeneratePrism(value = Component.class, publicAccess = true),
+  @GeneratePrism(value = Prototype.class, publicAccess = true),
+  @GeneratePrism(value = Scope.class, publicAccess = true),
+  @GeneratePrism(value = Qualifier.class, publicAccess = true),
+  @GeneratePrism(value = Named.class, publicAccess = true),
+  @GeneratePrism(value = Inject.class, publicAccess = true),
+  @GeneratePrism(value = Aspect.class, publicAccess = true),
+  @GeneratePrism(value = Primary.class, publicAccess = true),
+  @GeneratePrism(value = Secondary.class, publicAccess = true),
+  @GeneratePrism(value = Proxy.class, publicAccess = true),
+  @GeneratePrism(value = DependencyMeta.class, publicAccess = true),
+  @GeneratePrism(value = Bean.class, publicAccess = true),
+  @GeneratePrism(value = io.avaje.inject.spi.Generated.class, publicAccess = true),
+
+})
 package io.avaje.inject.generator;
+
+import io.avaje.inject.Bean;
+import io.avaje.inject.Component;
+import io.avaje.inject.Factory;
+import io.avaje.inject.InjectModule;
+import io.avaje.inject.Primary;
+import io.avaje.inject.Prototype;
+import io.avaje.inject.Secondary;
+import io.avaje.inject.aop.Aspect;
+import io.avaje.inject.spi.DependencyMeta;
+import io.avaje.inject.spi.Proxy;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Scope;
+import jakarta.inject.Singleton;
+import net.java.dev.hickory.prism.GeneratePrism;
diff --git a/inject-generator/src/main/java/module-info.java b/inject-generator/src/main/java/module-info.java
@@ -2,7 +2,7 @@
 
   requires java.compiler;
   requires io.avaje.inject;
-  requires io.avaje.inject.prism;
+  requires hickory;
 
   uses io.avaje.inject.spi.Plugin;
   uses io.avaje.inject.spi.Module;

diff --git a/inject-prism/pom.xml b/inject-prism/pom.xml
diff --git a/inject-prism/src/main/java/io/avaje/inject/prism/PrismConstants.java b/inject-prism/src/main/java/io/avaje/inject/prism/PrismConstants.java
diff --git a/inject-prism/src/main/java/io/avaje/inject/prism/package-info.java b/inject-prism/src/main/java/io/avaje/inject/prism/package-info.java
diff --git a/inject-prism/src/main/java/module-info.java b/inject-prism/src/main/java/module-info.java
diff --git a/inject-prism/src/main/java/module-info.moditect b/inject-prism/src/main/java/module-info.moditect
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,6 @@
 
   <modules>
     <module>inject</module>
-    <module>inject-prism</module>
     <module>inject-generator</module>
     <module>inject-test</module>
   </modules>