Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Only generate scope constants for custom scopes. #9504

Merged
merged 1 commit into from
Nov 15, 2024
Merged

4.x: Only generate scope constants for custom scopes. #9504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions ...ce/inject/codegen/src/main/java/io/helidon/service/inject/codegen/InjectionExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,17 +2270,31 @@ private void qualifiersMethod(ClassModel.Builder classModel, DescribedService se

private void scopeMethod(ClassModel.Builder classModel, DescribedService service) {
// TypeName scope()
classModel.addField(scopesField -> scopesField
.isStatic(true)
.isFinal(true)
.name("SCOPE")
.type(TypeNames.TYPE_NAME)
.addContentCreate(service.scope()));
TypeName scope = service.scope();

classModel.addMethod(scopeMethod -> scopeMethod.name("scope")
.addAnnotation(Annotations.OVERRIDE)
.returnType(TypeNames.TYPE_NAME)
.addContentLine("return SCOPE;"));
if (scope.packageName().equals(INJECTION_SINGLETON.packageName())
&& scope.enclosingNames().size() == 1 && scope.enclosingNames().getFirst().equals("Injection")) {
// only method
classModel.addMethod(scopeMethod -> scopeMethod.name("scope")
.addAnnotation(Annotations.OVERRIDE)
.returnType(TypeNames.TYPE_NAME)
.addContent("return ")
.addContent(scope)
.addContentLine(".TYPE;"));
} else {
// field and method
classModel.addField(scopesField -> scopesField
.isStatic(true)
.isFinal(true)
.name("SCOPE")
.type(TypeNames.TYPE_NAME)
.addContentCreate(scope));

classModel.addMethod(scopeMethod -> scopeMethod.name("scope")
.addAnnotation(Annotations.OVERRIDE)
.returnType(TypeNames.TYPE_NAME)
.addContentLine("return SCOPE;"));
}
}

private void weightMethod(ClassModel.Builder classModel, DescribedService service) {
Expand Down