upgrade to the latest version

Author: linghuiluo

pom.xml

@@ -13,8 +13,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<magpiebridge.version>0.0.6</magpiebridge.version>
-		<irconverter.version>0.1.0</irconverter.version>
+		<magpiebridge.version>0.0.8</magpiebridge.version>
+		<irconverter.version>0.1.6</irconverter.version>
 		<soot.version>3.3.0</soot.version>
 	</properties>
 
@@ -37,6 +37,7 @@
 			<artifactId>soot</artifactId>
 			<version>${soot.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

src/main/java/HelloWorld.java

@@ -1,3 +1,5 @@
+import com.google.common.base.Supplier;
+
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 
 import magpiebridge.core.IProjectService;
@@ -15,13 +17,16 @@
 public class HelloWorld {
 
   public static void main(String... args) {
-    MagpieServer server = new MagpieServer(new ServerConfiguration());
-    String language = "java";
-    IProjectService javaProjectService = new JavaProjectService();
-    server.addProjectService(language, javaProjectService);
-    ServerAnalysis myAnalysis = new SimpleServerAnalysis();
-    Either<ServerAnalysis, ToolAnalysis> analysis=Either.forLeft(myAnalysis);
-	server.addAnalysis(analysis,language);
-    server.launchOnStdio();
+    Supplier<MagpieServer> createServer = () -> {
+      MagpieServer server = new MagpieServer(new ServerConfiguration());
+      String language = "java";
+      IProjectService javaProjectService = new JavaProjectService();
+      server.addProjectService(language, javaProjectService);
+      ServerAnalysis myAnalysis = new SimpleServerAnalysis();
+      Either<ServerAnalysis, ToolAnalysis> analysis = Either.forLeft(myAnalysis);
+      server.addAnalysis(analysis, language);
+      return server;
+    };
+    createServer.get().launchOnStdio();
   }
 }

src/main/java/SimpleServerAnalysis.java

@@ -12,6 +12,7 @@
 import com.ibm.wala.classLoader.Module;
 
 import magpiebridge.converter.WalaToSootIRConverter;
+import magpiebridge.core.AnalysisConsumer;
 import magpiebridge.core.AnalysisResult;
 import magpiebridge.core.IProjectService;
 import magpiebridge.core.MagpieServer;
@@ -43,8 +44,8 @@ public String source() {
   }
 
   @Override
-  public void analyze(Collection<? extends Module> files, MagpieServer server, boolean rerun) {
-
+  public void analyze(Collection<? extends Module> files, AnalysisConsumer consumer, boolean rerun) {
+    
     if (last != null && !last.isDone()) {
       last.cancel(false);
       if (last.isCancelled())
@@ -53,6 +54,7 @@ public void analyze(Collection<? extends Module> files, MagpieServer server, boo
     Future<?> future = exeService.submit(new Runnable() {
       @Override
       public void run() {
+        MagpieServer server=(MagpieServer) consumer;
         setClassPath(server);
         Collection<AnalysisResult> results = Collections.emptyList();
         if (srcPath != null) {