Skip to content

feat: array/list parameter support for Gestalt-DI annotations #160

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: array/list parameter support for Gestalt-DI annotations #160

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion gestalt-di/src/main/java/org/terasology/gestalt/di/DefaultBeanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ public BeanEnvironment getEnvironment() {
@Override
public void close() throws Exception {
for (Object o : this.boundObjects.values()) {
if (o instanceof AutoCloseable) {
if (o instanceof AutoCloseable && o != this) {
try {
((AutoCloseable) o).close();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion gestalt-inject-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
testImplementation "ch.qos.logback:logback-classic:$logback_version"
testImplementation "org.mockito:mockito-core:$mockito_version"

implementation 'com.squareup:javapoet:1.12.0'
implementation 'com.squareup:javapoet:1.13.0'
implementation group: 'javax.inject', name: 'javax.inject', version: '1'
implementation project(":gestalt-inject");
}
15 changes: 11 additions & 4 deletions ...a/src/main/java/org/terasology/gestalt/annotation/processing/BeanDefinitionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,22 @@ public Object visitType(TypeElement e, String className) {
return super.visitType(e, className);
}

private Object getValue(Object target) {
private Object getValue(TypeMirror type, Object target) {
Object result;
if (target instanceof String) {
result = String.format("\"%s\"", target);
} else if (target instanceof List) {
if (((List<?>) target).isEmpty()) {
result = "new " + type + "{}";
} else {
result = target;
}
} else if (type.getKind() == TypeKind.DECLARED && ((DeclaredType) type).asElement().getKind() == ElementKind.ENUM) {
result = type + "." + target;
} else {
result = target;
}
return result;

}

private List<CodeBlock> buildAnnotationValues(List<? extends AnnotationMirror> mirrors) {
Expand All @@ -198,7 +205,7 @@ private List<CodeBlock> buildAnnotationValues(List<? extends AnnotationMirror> m
ExecutableElement executableElement = (ExecutableElement) element;
AnnotationValue value = executableElement.getDefaultValue();
if (value != null) {
defaults.add(CodeBlock.of("$S,$L", executableElement.getSimpleName(), getValue(value.getValue())));
defaults.add(CodeBlock.of("$S,$L", executableElement.getSimpleName(), getValue(executableElement.getReturnType(), value.getValue())));
}
}
}
Expand All @@ -207,7 +214,7 @@ private List<CodeBlock> buildAnnotationValues(List<? extends AnnotationMirror> m
ExecutableElement executableElement = entry.getKey();
AnnotationValue value = entry.getValue();
if (value != null) {
values.add(CodeBlock.of("$S,$L", executableElement.getSimpleName(), getValue(value.getValue())));
values.add(CodeBlock.of("$S,$L", executableElement.getSimpleName(), getValue(executableElement.asType(), value.getValue())));
}
}

Expand Down
2 changes: 1 addition & 1 deletion gestalt-module/src/main/java/org/terasology/gestalt/naming/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public int getPatch() {
* @return Whether this version is a snapshot (work in progress)
*/
public boolean isSnapshot() {
return !semver.preReleaseVersion().isEmpty();
return semver.preReleaseVersion().isPresent();
}

public Version getSnapshot() {
Expand Down