remove the spring data dependency

pom.xml

@@ -32,11 +32,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<version>RELEASE</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>

src/main/java/com/moekr/moocoder/logic/api/Wala.java

@@ -1,26 +1,9 @@
 package com.moekr.moocoder.logic.api;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.stream.Stream;
-
 import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
-import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.CallGraph;
-import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
-import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
-import com.ibm.wala.ipa.callgraph.CallGraphStats;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.*;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
@@ -28,12 +11,20 @@ import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.graph.traverse.DFS;
 import com.ibm.wala.util.io.FileProvider;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.util.Pair;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.stream.Stream;
 
 /**
  * @author miaomuzhi
@@ -104,7 +95,7 @@ public class Wala {
                 totalCount ++;
             }
         }
-        return Pair.of(abstractCount, totalCount);
+        return Pair.make(abstractCount, totalCount);
     }
 
     /**
@@ -127,7 +118,7 @@ public class Wala {
                 totalCount ++;
             }
         }
-        return Pair.of(abstractCount, totalCount);
+        return Pair.make(abstractCount, totalCount);
     }
 
 

src/main/java/com/moekr/moocoder/logic/api/WalaController.java

@@ -6,10 +6,10 @@ import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
+import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.traverse.DFS;
 import com.moekr.moocoder.util.FileUtil;
 import com.moekr.moocoder.util.enums.Source;
-import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Component;
 
 import java.io.*;

src/main/java/com/moekr/moocoder/logic/service/VisualizationService.java

@@ -1,9 +1,9 @@
 package com.moekr.moocoder.logic.service;
 
+import com.ibm.wala.util.collections.Pair;
 import com.moekr.moocoder.logic.vo.CallGraphVO;
 import com.moekr.moocoder.logic.vo.OOPMetricVO;
 import com.moekr.moocoder.util.enums.Granularity;
-import org.springframework.data.util.Pair;
 
 import java.util.List;
 

src/main/java/com/moekr/moocoder/logic/service/impl/OOPMetricAnalyzer.java

@@ -1,6 +1,7 @@
 package com.moekr.moocoder.logic.service.impl;
 
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
+import com.ibm.wala.util.collections.Pair;
 import com.moekr.moocoder.logic.api.WalaController;
 import com.moekr.moocoder.logic.vo.CallGraphEdgeVO;
 import com.moekr.moocoder.logic.vo.CallGraphNodeVO;
@@ -10,7 +11,6 @@ import com.moekr.moocoder.util.enums.Granularity;
 import com.moekr.moocoder.util.enums.Source;
 import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -55,7 +55,7 @@ public class OOPMetricAnalyzer {
             }
 
             Pair<Integer, Integer> pair = walaController.countAbstractness(srcDir, group, Source.CLASS_FILE);
-            double abstractness = pair.getFirst() / (double)pair.getSecond();
+            double abstractness = pair.fst / (double)pair.snd;
             List<String> walaOutput = walaController.getWalaOutput(srcDir, dstDir, Source.CLASS_FILE);
             return analyzeMetricExceptAbstractness(walaOutput, group, abstractness);
         } catch (IOException|CallGraphBuilderCancelException e){

src/main/java/com/moekr/moocoder/logic/service/impl/ProjectPath.java

@@ -12,8 +12,6 @@ public class ProjectPath {
     static String pmdOutputDir;
 
     //deprecated paths
-    private static String projectBytecodeDir;
-    private static String srcCodeDir;
     static String tempZipDir;
 
     static {
@@ -23,8 +21,6 @@ public class ProjectPath {
 
         //deprecated paths
         tempZipDir = ProjectPath.class.getResource("/wala/zips").getFile();
-        projectBytecodeDir = ProjectPath.class.getResource("/wala/projects").getFile();
-        srcCodeDir = ProjectPath.class.getResource("/wala/src_code").getFile();
     }
 
     private ProjectPath() {}
@@ -44,12 +40,4 @@ public class ProjectPath {
     static String getOutputFullPath(String project){
         return walaOutputDir + File.separator + project;
     }
-
-
-    static String getProjectBytecodeStubFullPath(String project) {
-        return projectBytecodeDir + File.separator + project;
-    }
-
-    static String getSrcCodeStubDir(String project) {return srcCodeDir + File.separator + project; }
-
 }

src/main/java/com/moekr/moocoder/logic/service/impl/VisualizationServiceImpl.java

@@ -1,11 +1,11 @@
 package com.moekr.moocoder.logic.service.impl;
 
+import com.ibm.wala.util.collections.Pair;
 import com.moekr.moocoder.logic.service.VisualizationService;
 import com.moekr.moocoder.logic.vo.CallGraphVO;
 import com.moekr.moocoder.logic.vo.OOPMetricVO;
 import com.moekr.moocoder.util.enums.Granularity;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -72,7 +72,7 @@ public class VisualizationServiceImpl implements VisualizationService {
                 "            return tempLeast\n" +
                 "        return recursion(n)\n" +
                 "            ";
-        return Pair.of(first, second);
+        return Pair.make(first, second);
     }
 
     @Override

src/main/java/com/moekr/moocoder/web/VisualizationController.java

@@ -1,5 +1,6 @@
 package com.moekr.moocoder.web;
 
+import com.ibm.wala.util.collections.Pair;
 import com.moekr.moocoder.logic.service.VisualizationService;
 import com.moekr.moocoder.logic.vo.CallGraphEdgeVO;
 import com.moekr.moocoder.logic.vo.CallGraphNodeVO;
@@ -7,7 +8,6 @@ import com.moekr.moocoder.logic.vo.CallGraphVO;
 import com.moekr.moocoder.logic.vo.OOPMetricVO;
 import com.moekr.moocoder.util.enums.Granularity;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.util.Pair;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

src/main/resources/application.properties

@@ -1,29 +1,6 @@
-#端口配置
-server.port=8090
-
 #thymeleaf配置，包括模版路径等
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
 spring.thymeleaf.mode=HTML
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.cache=false
-
-#上传文件大小配置
-spring.servlet.multipart.max-file-size=1024MB
-spring.servlet.multipart.max-request-size=2048MB
-
-#数据库配置
-spring.datasource.url=jdbc:mysql://localhost:3306/yummy?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2b8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-spring.jackson.serialization.indent_output=true
-#自动更新表结构
-spring.jpa.properties.hibernate.hbm2ddl.auto=update
-#命名规则，定制化命名
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-#使用MYSQL5InnoDB作为数据库访问方言，支持事务管理，方便测试回滚
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-#显示sql语句
-spring.jpa.properties.hibernate.show_sql=true