Skip to content

Commit 1df4fbd

Browse files
authored
Merge branch 'master' into isbeanAbsent
2 parents 588b175 + 1486196 commit 1df4fbd

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

inject-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>avaje inject generator</name>
1414
<description>annotation processor generating source code for avaje-inject dependency injection</description>
1515
<properties>
16-
<avaje.prisms.version>1.33</avaje.prisms.version>
16+
<avaje.prisms.version>1.34</avaje.prisms.version>
1717
<!-- VALHALLA-START ___
1818
<maven.compiler.enablePreview>false</maven.compiler.enablePreview>
1919
____ VALHALLA-END -->

inject-generator/src/main/java/io/avaje/inject/generator/EventPublisherWriter.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.util.Optional;
1515

1616
import javax.lang.model.element.Element;
17+
import javax.lang.model.element.PackageElement;
1718
import javax.tools.JavaFileObject;
1819

1920
/** Write the source code for the bean. */
@@ -46,22 +47,23 @@ static void write(Element element) {
4647
private EventPublisherWriter(Element element) {
4748
final var asType = element.asType();
4849
this.utype = UType.parse(asType).param0();
49-
this.packageName = APContext.elements()
50-
.getPackageOf(APContext.typeElement(utype.mainType()))
51-
.getQualifiedName()
52-
.toString()
50+
this.packageName = Optional.ofNullable(APContext.typeElement(utype.mainType()))
51+
.map(APContext.elements()::getPackageOf)
52+
.map(PackageElement::getQualifiedName)
53+
.map(Object::toString)
54+
.orElse("error.notype")
5355
.replaceFirst("java.", "")
5456
+ ".events";
55-
qualifier = Optional.ofNullable(Util.named(element)).orElse("");
57+
58+
this.qualifier = Optional.ofNullable(Util.named(element)).orElse("");
5659
var className =
5760
packageName
5861
+ "."
5962
+ (qualifier.isEmpty() ? "" : "Qualified")
6063
+ Util.shortName(utype).replace(".", "_")
6164
+ "$Publisher";
6265

63-
originName = getUniqueClassName(className, 0);
64-
66+
this.originName = getUniqueClassName(className, 0);
6567
if (GENERATED_PUBLISHERS.containsKey(originName)) {
6668
//in super niche situations when compiling the same module, we need to tell avaje that these types already exist
6769
//got this when running both my eclipse compiler and then the terminal build

inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void apply(Project project) {
3131
project.afterEvaluate(
3232
prj -> {
3333
// run it automatically before build
34-
Task buildTask = prj.getTasks().getByName("build");
34+
Task buildTask = prj.getTasks().getByName("compileJava");
3535
buildTask.doFirst(it -> writeProvides(project));
3636
});
3737
// register a task to run it manually

0 commit comments

Comments
 (0)