azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

di: @PreDestroy

Browse Source 
I need in my private experiments
This commit is contained in:
Stepan Koltsov
2012-04-20 21:33:18 +04:00
parent 994e6fe009
commit 3b0c9244c9
12 changed files with 97 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
+4
View File
@@ -170,4 +170,8 @@ public class GenerationState {
return answer.toString();
}
public void destroy() {
injector.destroy();
}
}
compiler/backend/src/org/jetbrains/jet/di/InjectorForJetTypeMapper.java
+5
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import java.util.List;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForJetTypeMapper {
@@ -70,6 +71,10 @@ public class InjectorForJetTypeMapper {
}
@PreDestroy
public void destroy() {
}
public JetTypeMapper getJetTypeMapper() {
return this.jetTypeMapper;
}
compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java
+5
View File
@@ -40,6 +40,7 @@ import org.jetbrains.jet.codegen.ClassBuilderMode;
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.codegen.ClassBuilderFactory;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForJvmCodegen {
@@ -103,6 +104,10 @@ public class InjectorForJvmCodegen {
}
@PreDestroy
public void destroy() {
}
public JetStandardLibrary getJetStandardLibrary() {
return this.jetStandardLibrary;
}
compiler/cli/src/org/jetbrains/jet/compiler/KotlinToJVMBytecodeCompiler.java
+17 -12
View File
@@ -165,21 +165,26 @@ public class KotlinToJVMBytecodeCompiler {
return false;
}
ClassFileFactory factory = generationState.getFactory();
if (jar != null) {
try {
CompileEnvironmentUtil.writeToJar(factory, new FileOutputStream(jar), mainClass, includeRuntime);
} catch (FileNotFoundException e) {
throw new CompileEnvironmentException("Invalid jar path " + jar, e);
try {
ClassFileFactory factory = generationState.getFactory();
if (jar != null) {
try {
CompileEnvironmentUtil.writeToJar(factory, new FileOutputStream(jar), mainClass, includeRuntime);
} catch (FileNotFoundException e) {
throw new CompileEnvironmentException("Invalid jar path " + jar, e);
}
}
else if (outputDir != null) {
CompileEnvironmentUtil.writeToOutputDirectory(factory, outputDir);
}
else {
throw new CompileEnvironmentException("Output directory or jar file is not specified - no files will be saved to the disk");
}
return true;
}
else if (outputDir != null) {
CompileEnvironmentUtil.writeToOutputDirectory(factory, outputDir);
finally {
generationState.destroy();
}
else {
throw new CompileEnvironmentException("Output directory or jar file is not specified - no files will be saved to the disk");
}
return true;
}
public static boolean compileBunchOfSources(
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+5
View File
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForJavaSemanticServices {
@@ -94,6 +95,10 @@ public class InjectorForJavaSemanticServices {
}
@PreDestroy
public void destroy() {
}
public JavaSemanticServices getJavaSemanticServices() {
return this.javaSemanticServices;
}
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+5
View File
@@ -55,6 +55,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerForJvm {
@@ -241,6 +242,10 @@ public class InjectorForTopDownAnalyzerForJvm {
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+6 -2
View File
@@ -95,9 +95,13 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
compilerDependencies);
injector.getTopDownAnalyzer().analyzeFiles(files);
try {
injector.getTopDownAnalyzer().analyzeFiles(files);
return AnalyzeExhaust.success(bindingTraceContext.getBindingContext(), JetStandardLibrary.getInstance());
return AnalyzeExhaust.success(bindingTraceContext.getBindingContext(), JetStandardLibrary.getInstance());
} finally {
injector.destroy();
}
}
public static AnalyzeExhaust shallowAnalyzeFiles(Collection<JetFile> files,
compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java
+5
View File
@@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForMacros {
@@ -75,6 +76,10 @@ public class InjectorForMacros {
}
@PreDestroy
public void destroy() {
}
public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices;
}
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
+5
View File
@@ -49,6 +49,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerBasic {
@@ -198,6 +199,10 @@ public class InjectorForTopDownAnalyzerBasic {
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}
compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
+5
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.OverloadingConflictResolver;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForTests {
@@ -78,6 +79,10 @@ public class InjectorForTests {
}
@PreDestroy
public void destroy() {
}
public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver;
}
injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
+30 -1
View File
@@ -27,10 +27,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -106,6 +108,8 @@ public class DependencyInjectorGenerator {
out.println();
generateConstructor(injectorClassName, out);
out.println();
generateDestroy(injectorClassName, out);
out.println();
generateGetters(out);
// Needed to fix double-checked locking
// out.println();
@@ -212,6 +216,7 @@ public class DependencyInjectorGenerator {
break;
}
}
generateImportDirective(out, PreDestroy.class, injectorPackageName);
}
private void generateImportDirectives(PrintStream out, DiType type, String injectorPackageName) {
@@ -305,9 +310,17 @@ public class DependencyInjectorGenerator {
}
private static List<Method> getPostConstructMethods(Class<?> clazz) {
return getInjectSpecialMethods(clazz, PostConstruct.class);
}
private static List<Method> getPreDestroyMethods(Class<?> clazz) {
return getInjectSpecialMethods(clazz, PreDestroy.class);
}
private static List<Method> getInjectSpecialMethods(Class<?> clazz, Class<? extends Annotation> annotationClass) {
List<Method> r = Lists.newArrayList();
for (Method method : clazz.getMethods()) {
if (method.getAnnotation(PostConstruct.class) != null) {
if (method.getAnnotation(annotationClass) != null) {
if (method.getParameterTypes().length != 0) {
throw new IllegalStateException("@PostConstruct method must have no arguments: " + method);
}
@@ -317,6 +330,22 @@ public class DependencyInjectorGenerator {
return r;
}
private void generateDestroy(@NotNull String injectorClassName, @NotNull PrintStream out) {
out.println(" @PreDestroy");
out.println(" public void destroy() {");
for (Field field : fields) {
// TODO: type of field may be different from type of object
List<Method> preDestroyMethods = getPreDestroyMethods(field.getType().getClazz());
for (Method preDestroy : preDestroyMethods) {
out.println(" " + field.getName() + "." + preDestroy.getName() + "();");
}
if (preDestroyMethods.size() > 0) {
out.println();
}
}
out.println(" }");
}
private void generateGetters(PrintStream out) {
String indent0 = " ";
String indent1 = indent0 + INDENT_STEP;
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
+5
View File
@@ -49,6 +49,7 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.ModuleConfiguration;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
public class InjectorForTopDownAnalyzerForJs {
@@ -198,6 +199,10 @@ public class InjectorForTopDownAnalyzerForJs {
}
@PreDestroy
public void destroy() {
}
public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer;
}