Skip to content

Commit e6d66cd

Browse files
authored
fix default package generating in modules (#946)
1 parent 7528131 commit e6d66cd

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

blackbox-test-inject/src/main/java/org/example/myapp/pkg_private/Adder.java renamed to blackbox-test-inject/src/main/java/io/example/myapp/pkg_private/Adder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.example.myapp.pkg_private;
1+
package io.example.myapp.pkg_private;
22

33
interface Adder {
44
int add(int a, int b);

blackbox-test-inject/src/main/java/org/example/myapp/pkg_private/AdderImpl.java renamed to blackbox-test-inject/src/main/java/io/example/myapp/pkg_private/AdderImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.example.myapp.pkg_private;
1+
package io.example.myapp.pkg_private;
22

33
import jakarta.inject.Singleton;
44

blackbox-test-inject/src/main/java/org/example/myapp/pkg_private/Calculator.java renamed to blackbox-test-inject/src/main/java/io/example/myapp/pkg_private/Calculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.example.myapp.pkg_private;
1+
package io.example.myapp.pkg_private;
22

33
import jakarta.inject.Singleton;
44

blackbox-test-inject/src/main/java/module-info.java

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

2323
requires static io.avaje.spi;
2424

25-
provides InjectExtension with org.example.myapp.CompiledOrder, ConfigPropertiesPlugin, org.example.myapp.MyappModule;
25+
provides InjectExtension with org.CompiledOrder, org.MyappModule, org.example.myapp.ConfigPropertiesPlugin;
2626
provides MyServiceIface with MyServiceImpl;
2727
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.example.myapp.pkg_private;
1+
package io.example.myapp.pkg_private;
22

33
import io.avaje.inject.BeanScope;
44
import org.junit.jupiter.api.Test;

blackbox-test-inject/src/test/java/org/example/myapp/supplier/MySupFactoryTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package org.example.myapp.supplier;
22

3-
import io.avaje.inject.BeanScope;
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
45
import org.example.external.aspect.sub.ExampleExternalAspectModule;
5-
import org.example.myapp.MyappModule;
6+
import org.MyappModule;
67
import org.junit.jupiter.api.Test;
78
import org.other.one.OneModule;
89

9-
import static org.assertj.core.api.Assertions.assertThat;
10+
import io.avaje.inject.BeanScope;
1011

1112
class MySupFactoryTest {
1213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private String initName(String topPackage) {
151151
void initialiseName(String topPackage) throws IOException {
152152
emptyModule = topPackage == null;
153153
if (!emptyModule) {
154-
var defaultPackage = APContext.elements().getPackageElement(topPackage) == null;
154+
var defaultPackage = APContext.getProjectModuleElement().isUnnamed() && APContext.elements().getPackageElement(topPackage) == null;
155155
modulePackage = defaultPackage ? "" : topPackage;
156156
final String name = defaultPackage ? "Default" : initName(modulePackage);
157157
moduleShortName = name + "Module";

0 commit comments

Comments
 (0)