Skip to content

Commit d09c0e2

Browse files
SentryManSentryMan
committed
don't need prism module
1 parent b23e7f0 commit d09c0e2

21 files changed

+53
-164
lines changed

‎inject-generator/pom.xml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<scope>provided</scope>
2020
</dependency>
2121

22-
<dependency>
23-
<groupId>io.avaje</groupId>
24-
<artifactId>avaje-inject-prism</artifactId>
25-
<version>${project.version}</version>
26-
</dependency>
27-
22+
<dependency>
23+
<groupId>com.jolira</groupId>
24+
<artifactId>hickory</artifactId>
25+
<version>1.0.0</version>
26+
<optional>true</optional>
27+
<scope>provided</scope>
28+
</dependency>
2829

2930
<!-- test dependencies -->
3031
<dependency>
@@ -47,9 +48,15 @@
4748
<configuration>
4849
<source>11</source>
4950
<target>11</target>
50-
<compilerArgument>-proc:none</compilerArgument>
51-
</configuration>
52-
</plugin>
51+
<annotationProcessorPaths>
52+
<annotationProcessorPath>
53+
<groupId>com.jolira</groupId>
54+
<artifactId>hickory</artifactId>
55+
<version>1.0.0</version>
56+
</annotationProcessorPath>
57+
</annotationProcessorPaths>
58+
</configuration>
59+
</plugin>
5360

5461
<plugin>
5562
<groupId>org.apache.maven.plugins</groupId>

‎inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import javax.lang.model.element.Element;
99
import javax.lang.model.element.TypeElement;
1010

11-
import io.avaje.inject.prism.InjectModulePrism;
1211

1312
final class AllScopes {
1413

‎inject-generator/src/main/java/io/avaje/inject/generator/AspectAnnotationReader.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
import javax.lang.model.element.*;
55

6-
import io.avaje.inject.prism.AspectPrism;
7-
86
import java.util.ArrayList;
97
import java.util.List;
108
import java.util.Map;

‎inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
import javax.lang.model.element.Element;
1010
import javax.lang.model.element.TypeElement;
1111

12-
import io.avaje.inject.prism.PrimaryPrism;
13-
import io.avaje.inject.prism.PrototypePrism;
14-
import io.avaje.inject.prism.ProxyPrism;
15-
import io.avaje.inject.prism.SecondaryPrism;
1612

1713
final class BeanReader {
1814

‎inject-generator/src/main/java/io/avaje/inject/generator/MetaData.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.Set;
77
import java.util.stream.Collectors;
88

9-
import io.avaje.inject.prism.DependencyMetaPrism;
109

1110
/**
1211
* Holds the data as per <code>@DependencyMeta</code>

‎inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
import javax.lang.model.element.VariableElement;
1212
import javax.lang.model.type.TypeMirror;
1313

14-
import io.avaje.inject.prism.BeanPrism;
15-
import io.avaje.inject.prism.PrimaryPrism;
16-
import io.avaje.inject.prism.PrototypePrism;
17-
import io.avaje.inject.prism.SecondaryPrism;
1814

1915
final class MethodReader {
2016

‎inject-generator/src/main/java/io/avaje/inject/generator/Processor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import javax.lang.model.element.TypeElement;
2323
import javax.lang.model.util.Elements;
2424
import javax.tools.StandardLocation;
25-
import io.avaje.inject.prism.InjectModulePrism;
26-
import io.avaje.inject.prism.ScopePrism;
2725

2826

2927
@SupportedAnnotationTypes({

‎inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import javax.lang.model.element.TypeElement;
1818
import javax.tools.JavaFileObject;
1919

20-
import io.avaje.inject.prism.DependencyMetaPrism;
21-
import io.avaje.inject.prism.InjectModulePrism;
2220

2321
final class ScopeInfo {
2422

‎inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import javax.lang.model.element.TypeElement;
66
import javax.lang.model.type.DeclaredType;
77

8-
import io.avaje.inject.prism.QualifierPrism;
98

109
import java.util.ArrayList;
1110
import java.util.List;

‎inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsInjection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package io.avaje.inject.generator;
22

3-
import io.avaje.inject.prism.BeanPrism;
4-
import io.avaje.inject.prism.InjectPrism;
5-
63
import javax.lang.model.element.Element;
74
import javax.lang.model.element.ExecutableElement;
85
import javax.lang.model.element.Modifier;

‎inject-generator/src/main/java/io/avaje/inject/generator/TypeExtendsReader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
import javax.lang.model.element.TypeElement;
1212
import javax.lang.model.type.TypeMirror;
1313

14-
import io.avaje.inject.prism.FactoryPrism;
15-
import io.avaje.inject.prism.GeneratedPrism;
16-
import io.avaje.inject.prism.ProxyPrism;
17-
1814
/**
1915
* Read the inheritance types for a given bean type.
2016
*/

‎inject-generator/src/main/java/io/avaje/inject/generator/TypeReader.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import javax.lang.model.element.Element;
55
import javax.lang.model.element.TypeElement;
66

7-
import io.avaje.inject.prism.NamedPrism;
8-
97
import java.util.List;
108
import java.util.Set;
119

‎inject-generator/src/main/java/io/avaje/inject/generator/Util.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import javax.lang.model.type.DeclaredType;
66
import javax.lang.model.type.TypeMirror;
77

8-
import io.avaje.inject.prism.NamedPrism;
9-
import io.avaje.inject.prism.QualifierPrism;
10-
118
final class Util {
129

1310
static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<";

‎inject-generator/src/main/java/io/avaje/inject/generator/package-info.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,37 @@
1+
@net.java.dev.hickory.prism.GeneratePrisms({
2+
@GeneratePrism(value = InjectModule.class, publicAccess = true),
3+
@GeneratePrism(value = Factory.class, publicAccess = true),
4+
@GeneratePrism(value = Singleton.class, publicAccess = true),
5+
@GeneratePrism(value = Component.class, publicAccess = true),
6+
@GeneratePrism(value = Prototype.class, publicAccess = true),
7+
@GeneratePrism(value = Scope.class, publicAccess = true),
8+
@GeneratePrism(value = Qualifier.class, publicAccess = true),
9+
@GeneratePrism(value = Named.class, publicAccess = true),
10+
@GeneratePrism(value = Inject.class, publicAccess = true),
11+
@GeneratePrism(value = Aspect.class, publicAccess = true),
12+
@GeneratePrism(value = Primary.class, publicAccess = true),
13+
@GeneratePrism(value = Secondary.class, publicAccess = true),
14+
@GeneratePrism(value = Proxy.class, publicAccess = true),
15+
@GeneratePrism(value = DependencyMeta.class, publicAccess = true),
16+
@GeneratePrism(value = Bean.class, publicAccess = true),
17+
@GeneratePrism(value = io.avaje.inject.spi.Generated.class, publicAccess = true),
18+
19+
})
120
package io.avaje.inject.generator;
21+
22+
import io.avaje.inject.Bean;
23+
import io.avaje.inject.Component;
24+
import io.avaje.inject.Factory;
25+
import io.avaje.inject.InjectModule;
26+
import io.avaje.inject.Primary;
27+
import io.avaje.inject.Prototype;
28+
import io.avaje.inject.Secondary;
29+
import io.avaje.inject.aop.Aspect;
30+
import io.avaje.inject.spi.DependencyMeta;
31+
import io.avaje.inject.spi.Proxy;
32+
import jakarta.inject.Inject;
33+
import jakarta.inject.Named;
34+
import jakarta.inject.Qualifier;
35+
import jakarta.inject.Scope;
36+
import jakarta.inject.Singleton;
37+
import net.java.dev.hickory.prism.GeneratePrism;

‎inject-generator/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
requires java.compiler;
44
requires io.avaje.inject;
5-
requires io.avaje.inject.prism;
5+
requires hickory;
66

77
uses io.avaje.inject.spi.Plugin;
88
uses io.avaje.inject.spi.Module;

‎inject-prism/pom.xml

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎inject-prism/src/main/java/io/avaje/inject/prism/PrismConstants.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎inject-prism/src/main/java/io/avaje/inject/prism/package-info.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎inject-prism/src/main/java/module-info.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎inject-prism/src/main/java/module-info.moditect

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
<modules>
2727
<module>inject</module>
28-
<module>inject-prism</module>
2928
<module>inject-generator</module>
3029
<module>inject-test</module>
3130
</modules>

0 commit comments

Comments
 (0)