Skip to content

Commit ec8e9a1

Browse files
committed
Revert "handle pkg private"
This reverts commit 5658f50.
1 parent 5658f50 commit ec8e9a1

File tree

3 files changed

+5
-28
lines changed

3 files changed

+5
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ final class MethodReader {
7575
var lazyPrism = Util.isLazy(element);
7676
lazy = lazyPrism != null;
7777
conditions.readAll(element);
78-
this.lazyProxyType = lazy ? Util.lazyProxy(element, beanType) : null;
78+
this.lazyProxyType = lazy ? Util.lazyProxy(element) : null;
7979
this.proxyLazy = lazy && lazyProxyType != null;
8080
if (lazy && !proxyLazy) {
8181
if (lazyPrism.enforceProxy()) {

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -395,19 +395,15 @@ static void validateBeanTypes(Element origin, List<TypeMirror> beanType) {
395395
});
396396
}
397397

398-
static TypeElement lazyProxy(TypeElement element) {
399-
return lazyProxy(element, element);
400-
}
401-
402-
static TypeElement lazyProxy(Element element, TypeElement source) {
398+
static TypeElement lazyProxy(Element element) {
403399
TypeElement type =
404400
element instanceof TypeElement
405401
? (TypeElement) element
406402
: APContext.asTypeElement(((ExecutableElement) element).getReturnType());
407403

408404
if (type.getModifiers().contains(Modifier.FINAL)
409405
|| !type.getKind().isInterface() && !Util.hasNoArgConstructor(type)
410-
|| Util.cantOverride(type, source)) {
406+
|| Util.hasFinalMethods(type)) {
411407

412408
return BeanTypesPrism.getOptionalOn(element)
413409
.map(BeanTypesPrism::value)
@@ -422,23 +418,11 @@ static TypeElement lazyProxy(Element element, TypeElement source) {
422418
return type;
423419
}
424420

425-
private static boolean cantOverride(TypeElement type, TypeElement source) {
426-
427-
var pkgPrivate =
428-
source
429-
.getEnclosingElement()
430-
.getSimpleName()
431-
.contentEquals(type.getEnclosingElement().getSimpleName());
432-
421+
private static boolean hasFinalMethods(TypeElement type) {
433422
return ElementFilter.methodsIn(type.getEnclosedElements()).stream()
434423
.filter(x -> !x.getModifiers().contains(Modifier.STATIC))
435424
.filter(x -> !x.getModifiers().contains(Modifier.PRIVATE))
436-
.anyMatch(
437-
m ->
438-
m.getModifiers().contains(Modifier.FINAL)
439-
|| !m.getModifiers().contains(Modifier.PUBLIC)
440-
&& !m.getModifiers().contains(Modifier.PROTECTED)
441-
&& !pkgPrivate);
425+
.anyMatch(m -> m.getModifiers().contains(Modifier.FINAL));
442426
}
443427

444428
static boolean hasNoArgConstructor(TypeElement beanType) {

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/lazy/LazyBeanPkgPrivate.java

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

0 commit comments

Comments
 (0)