Ericsson · Wrathan · Nov 25, 2020 · Dec 2, 2020 · Dec 8, 2020 · Feb 14, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
         run: >
           sudo apt-get install -y git cmake make g++ gcc-7-plugin-dev libboost-all-dev
           llvm-10-dev clang-10 libclang-10-dev default-jdk libssl1.0-dev libgraphviz-dev
-          libmagic-dev libgit2-dev ctags libgtest-dev npm libldap2-dev
+          libmagic-dev libgit2-dev ctags libgtest-dev npm libldap2-dev unzip
 
       - name: Install Postgresql Ubuntu 18
         if: ${{ matrix.os == 'ubuntu-18.04' && matrix.db == 'postgresql' }}
@@ -127,7 +127,7 @@ jobs:
         run: >
           sudo apt-get install -y git cmake make g++ libboost-all-dev llvm-10-dev clang-10
           libclang-10-dev odb libodb-dev thrift-compiler libthrift-dev default-jdk libssl-dev
-          libgraphviz-dev libmagic-dev libgit2-dev ctags libgtest-dev npm libldap2-dev
+          libgraphviz-dev libmagic-dev libgit2-dev ctags libgtest-dev npm libldap2-dev unzip
 
       - name: Install Postgresql Ubuntu 20
         if: ${{ matrix.os == 'ubuntu-20.04' && matrix.db == 'postgresql' }}
@@ -256,7 +256,7 @@ jobs:
           sudo apt-get install -y git cmake make g++ gcc-7-plugin-dev libgraphviz-dev
           libboost-filesystem-dev libboost-log-dev libboost-program-options-dev
           llvm-10-dev clang-10 libclang-10-dev default-jre libssl1.0-dev libmagic-dev
-          libgit2-dev ctags libgtest-dev libldap-2.4-2
+          libgit2-dev ctags libgtest-dev libldap-2.4-2 unzip
 
       - name: Install Postgresql Ubuntu 18
         if: ${{ matrix.os == 'ubuntu-18.04' && matrix.db == 'postgresql' }}
@@ -296,7 +296,7 @@ jobs:
           libboost-log-dev libboost-program-options-dev llvm-10-dev clang-10
           libclang-10-dev libgraphviz-dev libgtest-dev odb libodb-dev
           libthrift-dev default-jre libssl1.1 libmagic-dev libgit2-dev ctags
-          libldap-2.4-2
+          libldap-2.4-2 unzip
 
       - name: Install Postgresql Ubuntu 20
         if: ${{ matrix.os == 'ubuntu-20.04' && matrix.db == 'postgresql' }}

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
@@ -11,6 +11,7 @@ RUN set -x && apt-get update -qq \
   cmake make \
   default-jdk \
   ctags \
+  unzip \
   gcc-9 gcc-9-plugin-dev g++-9 \
   libboost-filesystem-dev \
   libboost-log-dev \

diff --git a/docker/runtime/Dockerfile b/docker/runtime/Dockerfile
@@ -71,6 +71,7 @@ RUN set -x && apt-get update -qq && \
     libldap-2.4-2 \
     libmagic-dev \
     libthrift-dev \
+    unzip \
     ctags && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/ && \

diff --git a/lib/java/commons-io-2.8.0.jar b/lib/java/commons-io-2.8.0.jar
diff --git a/lib/java/eclipselink-2.7.8.jar b/lib/java/eclipselink-2.7.8.jar
diff --git a/lib/java/jakarta.persistence-api-2.2.3.jar b/lib/java/jakarta.persistence-api-2.2.3.jar
diff --git a/lib/java/log4j-1.2-api-2.15.0.jar b/lib/java/log4j-1.2-api-2.15.0.jar
diff --git a/lib/java/log4j-1.2.17.jar b/lib/java/log4j-1.2.17.jar
diff --git a/lib/java/log4j-api-2.15.0.jar b/lib/java/log4j-api-2.15.0.jar
diff --git a/lib/java/log4j-core-2.15.0.jar b/lib/java/log4j-core-2.15.0.jar
diff --git a/lib/java/log4j-slf4j-impl-2.15.0.jar b/lib/java/log4j-slf4j-impl-2.15.0.jar
diff --git a/lib/java/org.eclipse.core.contenttype_3.7.600.v20200124-1609.jar b/lib/java/org.eclipse.core.contenttype_3.7.600.v20200124-1609.jar
diff --git a/lib/java/org.eclipse.core.jobs_3.10.600.v20191122-2104.jar b/lib/java/org.eclipse.core.jobs_3.10.600.v20191122-2104.jar
diff --git a/lib/java/org.eclipse.core.resources_3.13.600.v20191122-2104.jar b/lib/java/org.eclipse.core.resources_3.13.600.v20191122-2104.jar
diff --git a/lib/java/org.eclipse.core.runtime_3.17.100.v20200203-0917.jar b/lib/java/org.eclipse.core.runtime_3.17.100.v20200203-0917.jar
diff --git a/lib/java/org.eclipse.equinox.common_3.10.600.v20191004-1420.jar b/lib/java/org.eclipse.equinox.common_3.10.600.v20191004-1420.jar
diff --git a/lib/java/org.eclipse.equinox.preferences_3.7.500.v20190815-1535.jar b/lib/java/org.eclipse.equinox.preferences_3.7.500.v20190815-1535.jar
diff --git a/lib/java/org.eclipse.jdt.core_3.24.0.v20201123-0742.jar b/lib/java/org.eclipse.jdt.core_3.24.0.v20201123-0742.jar
diff --git a/lib/java/org.eclipse.osgi_3.15.0.v20190830-1434.jar b/lib/java/org.eclipse.osgi_3.15.0.v20190830-1434.jar
diff --git a/lib/java/postgresql-42.2.22.jar b/lib/java/postgresql-42.2.22.jar
diff --git a/lib/java/procyon-compilertools-0.5.36.jar b/lib/java/procyon-compilertools-0.5.36.jar
diff --git a/lib/java/procyon-core-0.5.36.jar b/lib/java/procyon-core-0.5.36.jar
diff --git a/lib/java/slf4j-log4j12-1.7.25.jar b/lib/java/slf4j-log4j12-1.7.25.jar
diff --git a/lib/java/sqlite-jdbc-3.34.0.jar b/lib/java/sqlite-jdbc-3.34.0.jar
diff --git a/plugins/cpp/webgui/js/cppInfoTree.js b/plugins/cpp/webgui/js/cppInfoTree.js
@@ -291,6 +291,7 @@ function (model, viewHandler, util) {
   }
 
   var cppInfoTree = {
+    id: 'cpp-infotree',
     render : function (elementInfo) {
       var ret = [];
 

diff --git a/plugins/dummy/parser/CMakeLists.txt b/plugins/dummy/parser/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/parser/include)
 
 add_library(dummyparser SHARED
-  src/dummyparser.cpp)
+        src/dummyparser.cpp)
 
 target_compile_options(dummyparser PUBLIC -Wno-unknown-pragmas)
 

diff --git a/plugins/dummy/service/CMakeLists.txt b/plugins/dummy/service/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(dummythrift STATIC
 target_compile_options(dummythrift PUBLIC -fPIC)
 
 add_library(dummyservice SHARED
-  src/dummyservice.cpp
+        src/javaservice.cpp
   src/plugin.cpp)
 
 target_compile_options(dummyservice PUBLIC -Wno-unknown-pragmas)

diff --git a/...my/service/include/service/dummyservice.h → ...mmy/service/include/service/javaservice.h b/...my/service/include/service/dummyservice.h → ...mmy/service/include/service/javaservice.h
diff --git a/plugins/dummy/service/src/dummyservice.cpp → plugins/dummy/service/src/javaservice.cpp b/plugins/dummy/service/src/dummyservice.cpp → plugins/dummy/service/src/javaservice.cpp
@@ -1,4 +1,4 @@
-#include <service/dummyservice.h>
+#include <service/javaservice.h>
 #include <util/dbutil.h>
 
 namespace cc

diff --git a/plugins/dummy/service/src/plugin.cpp b/plugins/dummy/service/src/plugin.cpp
@@ -1,6 +1,6 @@
 #include <webserver/pluginhelper.h>
 
-#include <service/dummyservice.h>
+#include <service/javaservice.h>
 
 /* These two methods are used by the plugin manager to allow dynamic loading
    of CodeCompass Service plugins. Clang (>= version 6.0) gives a warning that

diff --git a/plugins/java/CMakeLists.txt b/plugins/java/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(logger)
+add_subdirectory(model)
+add_subdirectory(parser)
+# add_subdirectory(test)
+add_subdirectory(service)
+
+install_webplugin(webgui)
diff --git a/plugins/java/logger/CMakeLists.txt b/plugins/java/logger/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(CMAKE_JAVA_INCLUDE_PATH
+  ${PROJECT_SOURCE_DIR}/lib/java/*
+  ${PLUGIN_DIR}/lib/java/*)
+
+add_jar(javalogger
+  SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/Logger.java
+  META-INF/logging.properties
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/META-INF/MANIFEST.MF
+  OUTPUT_NAME javalogger)
+
+install_jar(javalogger "${INSTALL_JAVA_LIB_DIR}")
diff --git a/plugins/java/logger/Logger.java b/plugins/java/logger/Logger.java
@@ -0,0 +1,25 @@
+package logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.LogManager;
+
+public abstract class Logger {
+  public static final java.util.logging.Logger LOGGER = initLogger();
+
+  private static java.util.logging.Logger initLogger() {
+    InputStream stream = Logger.class.getClassLoader().
+      getResourceAsStream("META-INF/logging.properties");
+
+    try {
+      LogManager.getLogManager().readConfiguration(stream);
+      return java.util.logging.Logger.getLogger(Logger.class.getName());
+
+    } catch (IOException e) {
+      System.err.println(
+        "Logger initialization for Java plugin has been failed."
+      );
+    }
+    return null;
+  }
+}
diff --git a/plugins/java/logger/META-INF/MANIFEST.MF b/plugins/java/logger/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Class-Path: log4j-1.2-api-2.15.0.jar
+            log4j-api-2.15.0.jar
+            log4j-core-2.15.0.jar
+            slf4j-api-1.7.25.jar
+            log4j-slf4j-impl-2.15.0.jar
diff --git a/plugins/java/logger/META-INF/logging.properties b/plugins/java/logger/META-INF/logging.properties
@@ -0,0 +1,5 @@
+handlers= java.util.logging.ConsoleHandler
+.level= INFO
+java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=[%4$s] %5$s%6$s%n
diff --git a/plugins/java/model/CMakeLists.txt b/plugins/java/model/CMakeLists.txt
@@ -0,0 +1,39 @@
+set(CMAKE_JAVA_INCLUDE_PATH
+  ${PROJECT_SOURCE_DIR}/lib/java/*
+  ${PLUGIN_DIR}/lib/java/*)
+
+set(CMAKE_JAVA_COMPILE_FLAGS
+  ${CMAKE_JAVA_COMPILE_FLAGS}
+    -sourcepath ${CMAKE_CURRENT_SOURCE_DIR}:${PLUGIN_DIR})
+
+add_jar(javamodel
+  SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/AstType.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/InitializerKind.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/MemberTypeKind.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/RelationKind.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/SymbolType.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/enums/Visibility.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/EMFactory.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaAnnotation.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaAstNode.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaConstructor.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaDocComment.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaEntity.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaEnum.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaEnumConstant.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaMethod.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaImport.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaInheritance.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaInitializer.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaMemberType.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaRecord.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaRelation.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaTypedEntity.java
+  ${CMAKE_CURRENT_SOURCE_DIR}/JavaVariable.java
+  META-INF/persistence.xml
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/META-INF/MANIFEST.MF
+  INCLUDE_JARS javalogger
+  OUTPUT_NAME javamodel)
+
+install_jar(javamodel "${INSTALL_JAVA_LIB_DIR}")
diff --git a/plugins/java/model/EMFactory.java b/plugins/java/model/EMFactory.java
@@ -0,0 +1,96 @@
+package model;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.logging.Level;
+
+import static logger.Logger.LOGGER;
+import static org.eclipse.persistence.config.PersistenceUnitProperties.*;
+
+public class EMFactory {
+  private final EntityManagerFactory emf;
+
+  public EMFactory(String rawDbContext, boolean dropAndCreateTables) {
+    this.emf =
+      Persistence.createEntityManagerFactory(
+        "ParserPU",
+        initProperties(rawDbContext, dropAndCreateTables)
+      );
+
+
+    if (dropAndCreateTables) {
+      emf.getMetamodel().getEntities().forEach(
+        e ->
+          LOGGER.log(
+            Level.INFO,
+            String.join(" ", "Dropping table", e.getName())
+          )
+      );
+    }
+  }
+
+  public EntityManager createEntityManager()
+  {
+    return emf.createEntityManager();
+  }
+
+  private HashMap<String, Object> initProperties(
+    String rawDbContext, boolean dropAndCreateTables)
+  {
+    HashMap<String, Object> properties = new HashMap<>();
+    String[] splitByColon = rawDbContext.split(":");
+    String dbType = splitByColon[0];
+    String contextString = splitByColon[1];
+    boolean isSqlite = dbType.equals("sqlite");
+    String driver =
+      isSqlite ? "org.sqlite.JDBC" : "org.postgresql.Driver";
+    String[] contextList = contextString.split(";");
+    HashMap<String, String> contextMap = new HashMap<>();
+
+    if (dropAndCreateTables) {
+      properties.put("eclipselink.ddl-generation", "drop-and-create-tables");
+    } else {
+      properties.put("eclipselink.ddl-generation", "create-tables");
+    }
+
+
+    properties.put(
+      TRANSACTION_TYPE,
+      PersistenceUnitTransactionType.RESOURCE_LOCAL.name()
+    );
+
+    Arrays.stream(contextList).forEach(c -> {
+      String[] splitContext = c.split("=");
+      contextMap.put(splitContext[0], splitContext[1]);
+    });
+
+    String connString =
+      isSqlite ?
+        "jdbc:" + "sqlite" + ":/" +
+          contextMap.get("database")
+            .replaceFirst("^~", System.getProperty("user.home"))
+        :
+        "jdbc:" + "postgresql" + "://" +
+          contextMap.get("host") + ":" +
+          contextMap.get("port") + "/" +
+          contextMap.get("database");
+
+    properties.put(JDBC_DRIVER, driver);
+    properties.put(JDBC_URL, connString);
+
+    if (!isSqlite) {
+      properties.put(JDBC_USER, contextMap.get("user"));
+      properties.put(JDBC_PASSWORD, contextMap.get("password"));
+    }
+
+    return properties;
+  }
+
+  public EntityManagerFactory getEmf() {
+    return emf;
+  }
+}
diff --git a/plugins/java/model/JavaAnnotation.java b/plugins/java/model/JavaAnnotation.java
@@ -0,0 +1,8 @@
+package model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "\"JavaAnnotation\"")
+public class JavaAnnotation extends JavaEntity {
+}