Ericsson · mcserep · Nov 12, 2023 · Oct 25, 2023 · Oct 25, 2023 · Oct 25, 2023
diff --git a/.gitlab/build-deps.sh b/.gitlab/build-deps.sh
@@ -328,9 +328,9 @@ fi
 ##########
 
 cd $PACKAGES_DIR
-wget --no-verbose --no-clobber http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz
-tar -xf thrift-0.13.0.tar.gz
-cd thrift-0.13.0
+wget --no-verbose --no-clobber http://archive.apache.org/dist/thrift/0.16.0/thrift-0.16.0.tar.gz
+tar -xf thrift-0.16.0.tar.gz
+cd thrift-0.16.0
 
 CXXFLAGS="$CXXFLAGS -I$DEPS_INSTALL_RUNTIME_DIR/boost-install/include" \
 LDFLAGS="$LDFLAGS -Wl,-rpath-link,$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib" \
@@ -342,7 +342,7 @@ LDFLAGS="$LDFLAGS -Wl,-rpath-link,$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib"
   --without-python
 
 make install --quiet --jobs $(nproc)
-rm -f $PACKAGES_DIR/thrift-0.13.0.tar.gz
+rm -f $PACKAGES_DIR/thrift-0.16.0.tar.gz
 
 ########
 # Java #

diff --git a/Functions.cmake b/Functions.cmake
@@ -124,4 +124,5 @@ function(join _values _glue _output)
   string (REGEX REPLACE "([^\\]|^);" "\\1${_glue}" _tmpStr "${_values}")
   string (REGEX REPLACE "[\\](.)" "\\1" _tmpStr "${_tmpStr}") #fixes escaping
   set (${_output} "${_tmpStr}" PARENT_SCOPE)
-endfunction(join)
+
+endfunction(join)
diff --git a/doc/deps.md b/doc/deps.md
@@ -180,10 +180,10 @@ avoid using them if it's not necessary.
 
 ```bash
 # Download and uncompress Thrift:
-wget "http://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=thrift/0.13.0/thrift-0.13.0.tar.gz" \
-  -O thrift-0.13.0.tar.gz
-tar -xvf ./thrift-0.13.0.tar.gz
-cd thrift-0.13.0
+wget "http://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=thrift/0.16.0/thrift-0.16.0.tar.gz" \
+  -O thrift-0.16.0.tar.gz
+tar -xvf ./thrift-0.16.0.tar.gz
+cd thrift-0.16.0
 
 ./configure --prefix=<thrift_install_dir> --silent --without-python \
   --enable-libtool-lock --enable-tutorial=no --enable-tests=no      \

diff --git a/lib/java/libthrift-0.13.0.jar b/lib/java/libthrift-0.13.0.jar
diff --git a/lib/java/libthrift-0.16.0.jar b/lib/java/libthrift-0.16.0.jar
diff --git a/plugins/cpp_reparse/service/CMakeLists.txt b/plugins/cpp_reparse/service/CMakeLists.txt
@@ -23,8 +23,6 @@ add_definitions(${LLVM_DEFINITIONS})
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/CppReparseService.cpp
@@ -42,7 +40,6 @@ add_custom_command(
     "Generating Thrift for cppreparse.thrift")
 
 add_library(cppreparsethrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/cppreparse_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/CppReparseService.cpp)
 

diff --git a/plugins/dummy/service/CMakeLists.txt b/plugins/dummy/service/CMakeLists.txt
@@ -9,10 +9,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_constants.h
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_types.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/DummyService.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/DummyService.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp
@@ -26,8 +22,6 @@ add_custom_command(
     "Generating Thrift for dummy.thrift")
 
 add_library(dummythrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_constants.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/dummy_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/DummyService.cpp)
 
 target_compile_options(dummythrift PUBLIC -fPIC)

diff --git a/plugins/git/service/CMakeLists.txt b/plugins/git/service/CMakeLists.txt
@@ -13,8 +13,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/GitService.cpp
@@ -31,7 +29,6 @@ add_custom_command(
     "Generating Thrift for git.thrift")
 
 add_library(gitthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/git_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/GitService.cpp)
 

diff --git a/plugins/metrics/service/CMakeLists.txt b/plugins/metrics/service/CMakeLists.txt
@@ -12,8 +12,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/MetricsService.cpp
@@ -30,7 +28,6 @@ add_custom_command(
     "Generating Thrift for metrics.thrift")
 
 add_library(metricsthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/metrics_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/MetricsService.cpp)
 

diff --git a/plugins/search/common/src/cc/search/common/ipc/IPCProcessor.java b/plugins/search/common/src/cc/search/common/ipc/IPCProcessor.java
@@ -60,13 +60,24 @@ public IPCProcessor(CommonOptions options_, TProcessor processor_)
     _processor = processor_;
 
     TProtocolFactory factory = new TBinaryProtocol.Factory();
-    _inTransport = new TIOStreamTransport(
-      new FileInputStream(getFileNameFromFd(options_.ipcInFd)));
-    _outTransport = new TIOStreamTransport(
-      new FileOutputStream(getFileNameFromFd(options_.ipcOutFd)));
-
-    _inProtocol = factory.getProtocol(_inTransport);
-    _outProtocol = factory.getProtocol(_outTransport);
+    TTransport inTransport = null;
+    TTransport outTransport = null;
+    TProtocol inProtocol = null;
+    TProtocol outProtocol = null;
+
+    try {
+      inTransport = new TIOStreamTransport(new FileInputStream(getFileNameFromFd(options_.ipcInFd)));
+      outTransport = new TIOStreamTransport(new FileOutputStream(getFileNameFromFd(options_.ipcOutFd)));
+      inProtocol = factory.getProtocol(inTransport);
+      outProtocol = factory.getProtocol(outTransport);
+    } catch (TTransportException ex) {
+      _log.log(Level.SEVERE, "An error occured during the initialization of IO stream transports!", ex);
+    } finally {
+      _inTransport = inTransport;
+      _outTransport = outTransport;
+      _inProtocol = inProtocol;
+      _outProtocol = outProtocol;
+    }
   }
 
   /**

diff --git a/plugins/search/service/CMakeLists.txt b/plugins/search/service/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(SYSTEM
 # Generate thrift files
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/search_constants.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/search_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/SearchService.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp
@@ -32,7 +31,6 @@ add_custom_command(
 
 # Create cpp static library from thrift files
 add_library(searchthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/search_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/search_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/SearchService.cpp)
 

diff --git a/service/authentication/CMakeLists.txt b/service/authentication/CMakeLists.txt
@@ -9,8 +9,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/AuthenticationService.cpp
@@ -29,7 +27,6 @@ add_custom_command(
     "Generating Thrift for authentication.thrift")
 
 add_library(authenticationthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/authentication_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/AuthenticationService.cpp)
 

diff --git a/service/language/CMakeLists.txt b/service/language/CMakeLists.txt
@@ -6,8 +6,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/LanguageService.cpp
@@ -24,7 +22,6 @@ add_custom_command(
     "Generating Thrift for language.thrift")
 
 add_library(languagethrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/language_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/LanguageService.cpp)
 

diff --git a/service/plugin/CMakeLists.txt b/service/plugin/CMakeLists.txt
@@ -9,10 +9,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_constants.h
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_types.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/PluginService.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/PluginService.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp
@@ -27,8 +23,6 @@ add_custom_command(
     "Generating Thrift for plugin.thrift")
 
 add_library(pluginthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_constants.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/plugin_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/PluginService.cpp)
 
 target_compile_options(pluginthrift PUBLIC -fPIC -Wno-unknown-pragmas)

diff --git a/service/project/CMakeLists.txt b/service/project/CMakeLists.txt
@@ -32,8 +32,6 @@ add_custom_command(
 # Do not add the same folders to both output commands as it produces a warning.
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/ProjectService.cpp
@@ -48,13 +46,11 @@ add_custom_command(
     "Generating Thrift for project.thrift")
 
 add_library(commonthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/common_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/common_types.cpp)
 
 target_compile_options(commonthrift PUBLIC -fPIC)
 
 add_library(projectthrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/project_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/ProjectService.cpp)
 

diff --git a/service/workspace/CMakeLists.txt b/service/workspace/CMakeLists.txt
@@ -9,8 +9,6 @@ include_directories(SYSTEM
 
 add_custom_command(
   OUTPUT
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_constants.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_constants.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_types.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_types.h
     ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/WorkspaceService.cpp
@@ -27,7 +25,6 @@ add_custom_command(
     "Generating Thrift for workspace.thrift")
 
 add_library(workspacethrift STATIC
-  ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_constants.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/workspace_types.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp/WorkspaceService.cpp)
 

diff --git a/webgui-new/package-lock.json b/webgui-new/package-lock.json
diff --git a/webgui-new/package.json b/webgui-new/package.json
@@ -53,7 +53,7 @@
     "recharts": "^2.5.0",
     "sass": "^1.57.1",
     "sharp": "^0.32.6",
-    "thrift": "0.13.0-hotfix.1"
+    "thrift": "0.16.0"
   },
   "engines": {
     "node": ">=18"

diff --git a/webgui-new/src/themes/theme.ts b/webgui-new/src/themes/theme.ts
@@ -1,8 +1,9 @@
 import { blue } from '@mui/material/colors';
 import { alpha, createTheme } from '@mui/material/styles';
-import { ReactDiffViewerStylesOverride } from 'react-diff-viewer-continued/lib/styles';
+import { ReactDiffViewerStylesOverride } from 'react-diff-viewer-continued';
 import React from 'react';
 
+
 declare module '@mui/material/styles' {
   export interface Theme {
     backgroundColors?: {

diff --git a/webgui/index.html b/webgui/index.html
@@ -21,7 +21,7 @@
 
     <!-- Third party libraries -->
 
-    <script type="text/javascript" src="scripts/node_modules/thrift/src/thrift.js"></script>
+    <script type="text/javascript" src="scripts/thrift.js"></script>
     <script type="text/javascript" src="scripts/node_modules/codemirror/lib/codemirror.js"></script>
     <script type="text/javascript" src="scripts/node_modules/codemirror/mode/clike/clike.js"></script>
     <script type="text/javascript" src="scripts/node_modules/codemirror/mode/erlang/erlang.js"></script>

diff --git a/webgui/login.html b/webgui/login.html
@@ -18,7 +18,7 @@
 
     <!-- Third party libraries -->
 
-    <script type="text/javascript" src="scripts/node_modules/thrift/src/thrift.js"></script>
+    <script type="text/javascript" src="scripts/thrift.js"></script>
     <script type="text/javascript" src="scripts/node_modules/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="scripts/node_modules/jsplumb/dist/js/jsplumb.min.js"></script>
     <script type="text/javascript" src="scripts/node_modules/js-cookie/src/js.cookie.js"></script>

diff --git a/webgui/package.json b/webgui/package.json
@@ -10,7 +10,6 @@
     "dojox"            : "^1.11.2",
     "dojo-util"        : "^1.11.2",
     "d3"               : "^3.5.6",
-    "thrift"           : "~0.13.0",
     "codemirror"       : "^5.19.0",
     "jquery.fancytree" : "^2.19.0",
     "svg-pan-zoom"     : "^3.6.1",