diff --git a/codecheck.ignore b/codecheck.ignore index eb860a6ca1..8e774c03ea 100644 --- a/codecheck.ignore +++ b/codecheck.ignore @@ -1 +1,10 @@ linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java +linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java +linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java +linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java +linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java +linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java +linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/common/LabelManagerMapper.xml +linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/HBaseConnectionManager.java +linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml +linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/AESUtils.java \ No newline at end of file diff --git a/linkis-commons/linkis-hadoop-common/src/main/java/org/apache/linkis/hadoop/common/utils/KerberosUtils.java b/linkis-commons/linkis-hadoop-common/src/main/java/org/apache/linkis/hadoop/common/utils/KerberosUtils.java index 67fecd04be..608d5fad3c 100644 --- a/linkis-commons/linkis-hadoop-common/src/main/java/org/apache/linkis/hadoop/common/utils/KerberosUtils.java +++ b/linkis-commons/linkis-hadoop-common/src/main/java/org/apache/linkis/hadoop/common/utils/KerberosUtils.java @@ -138,6 +138,7 @@ public static void checkStatus() { } else { LOG.info("CurrentUser is not null"); } + assert curUsr != null; if (loginUsr.getClass() != curUsr.getClass()) { LOG.info("getClass() is different"); } else { diff --git a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESClientFactory.java b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESClientFactory.java index 542230bd79..23135199fe 100644 --- a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESClientFactory.java +++ b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESClientFactory.java @@ -48,8 +48,8 @@ public class UJESClientFactory { public static UJESClient getReusable(VarAccess stdVarAccess) { if (client == null) { // NOSONAR - synchronized (UJESClientFactory.class) { - if (client == null) { + synchronized (UJESClientFactory.class) { // NOSONAR + if (client == null) { // NOSONAR client = getNew(stdVarAccess); } } diff --git a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/utils/SchedulerManager.java b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/utils/SchedulerManager.java index c177cafd3d..19e7a1257d 100644 --- a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/utils/SchedulerManager.java +++ b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/utils/SchedulerManager.java @@ -62,8 +62,8 @@ public static ExecutorService newFixedThreadPool( public static ThreadPoolExecutor getCachedThreadPoolExecutor() { if (cachedThreadPool == null) { // NOSONAR - synchronized (SchedulerManager.class) { - if (cachedThreadPool == null) { + synchronized (SchedulerManager.class) { // NOSONAR + if (cachedThreadPool == null) { // NOSONAR cachedThreadPool = newCachedThreadPool(THREAD_NUM, THREAD_NAME, IS_DEAMON); } } @@ -73,8 +73,8 @@ public static ThreadPoolExecutor getCachedThreadPoolExecutor() { public static ExecutorService getFixedThreadPool() { if (fixedThreadPool == null) { // NOSONAR - synchronized (SchedulerManager.class) { - if (fixedThreadPool == null) { + synchronized (SchedulerManager.class) { // NOSONAR + if (fixedThreadPool == null) { // NOSONAR fixedThreadPool = newFixedThreadPool(THREAD_NUM, THREAD_NAME, IS_DEAMON); } } diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java index 7b487352d5..0ffde329f9 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java +++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java @@ -95,6 +95,7 @@ public Message taskinfo( } } } + assert undoneTasks != null; Message resp = Message.ok("success") .data("taskNumber", undoneTasks.length) diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml index 72a1872172..845f5601b4 100644 --- a/linkis-engineconn-plugins/flink/pom.xml +++ b/linkis-engineconn-plugins/flink/pom.xml @@ -205,13 +205,13 @@ org.apache.kafka kafka-clients + 3.4.0 org.xerial.snappy snappy-java - 3.4.0 org.xerial.snappy diff --git a/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/operation/OperationFactoryImpl.java b/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/operation/OperationFactoryImpl.java index c43b70a601..c618f223d4 100644 --- a/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/operation/OperationFactoryImpl.java +++ b/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/operation/OperationFactoryImpl.java @@ -124,8 +124,8 @@ public Operation createOperation(SqlCommandCall call, FlinkEngineConnContext con public static OperationFactory getInstance() { if (operationFactory == null) { // NOSONAR - synchronized (OperationFactory.class) { - if (operationFactory == null) { + synchronized (OperationFactory.class) { // NOSONAR + if (operationFactory == null) { // NOSONAR operationFactory = ClassUtil.getInstance(OperationFactory.class, new OperationFactoryImpl()); } diff --git a/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/parser/SqlCommandParserImpl.java b/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/parser/SqlCommandParserImpl.java index 3c754e888e..22ac0b5708 100644 --- a/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/parser/SqlCommandParserImpl.java +++ b/linkis-engineconn-plugins/flink/src/main/java/org/apache/linkis/engineconnplugin/flink/client/sql/parser/SqlCommandParserImpl.java @@ -229,8 +229,8 @@ private SqlParser.Config createSqlParserConfig(boolean isBlinkPlanner) { public static SqlCommandParser getInstance() { if (sqlCommandParser == null) { // NOSONAR - synchronized (OperationFactory.class) { - if (sqlCommandParser == null) { + synchronized (OperationFactory.class) { // NOSONAR + if (sqlCommandParser == null) { // NOSONAR sqlCommandParser = ClassUtil.getInstance(SqlCommandParser.class, new SqlCommandParserImpl()); } diff --git a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/HBaseConnectionManager.java b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/HBaseConnectionManager.java index 4727e46ba4..2d86b8b44d 100644 --- a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/HBaseConnectionManager.java +++ b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/HBaseConnectionManager.java @@ -76,7 +76,7 @@ public class HBaseConnectionManager { private static final AtomicBoolean kerberosEnvInit = new AtomicBoolean(false); private static final int KERBEROS_RE_LOGIN_MAX_RETRY = 5; private static final long KERBEROS_RE_LOGIN_INTERVAL = 30 * 60 * 1000L; - private static volatile HBaseConnectionManager instance = null; + private static volatile HBaseConnectionManager instance = null; // NOSONAR private HBaseConnectionManager() { connectionMap = new ConcurrentHashMap<>(); @@ -84,8 +84,8 @@ private HBaseConnectionManager() { public static HBaseConnectionManager getInstance() { if (instance == null) { // NOSONAR - synchronized (HBaseConnectionManager.class) { - if (instance == null) { + synchronized (HBaseConnectionManager.class) { // NOSONAR + if (instance == null) { // NOSONAR instance = new HBaseConnectionManager(); } } diff --git a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellCommands.java b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellCommands.java index 6b095d05db..5c278ba752 100644 --- a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellCommands.java +++ b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellCommands.java @@ -35,14 +35,14 @@ public class HBaseShellCommands { private static final Logger LOG = LoggerFactory.getLogger(HBaseShellCommands.class); private static final String COMMANDS_PATH = "hbase-ruby/shell/commands/"; - private static volatile Set commandsSet; + private static volatile Set commandsSet; // NOSONAR private HBaseShellCommands() {} public static Set getAllCommands() throws IOException { - if (commandsSet == null) { - synchronized (HBaseShellCommands.class) { - if (commandsSet == null) { + if (commandsSet == null) { // NOSONAR + synchronized (HBaseShellCommands.class) { // NOSONAR + if (commandsSet == null) { // NOSONAR Set sortedSet = new TreeSet<>(); URL commandFilesUrl = HBaseShellCommands.class.getClassLoader().getResource(COMMANDS_PATH); diff --git a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellSessionManager.java b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellSessionManager.java index 7df2285710..1406707f36 100644 --- a/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellSessionManager.java +++ b/linkis-engineconn-plugins/hbase/hbase-core/src/main/java/org/apache/linkis/manager/engineplugin/hbase/shell/HBaseShellSessionManager.java @@ -29,7 +29,7 @@ public class HBaseShellSessionManager { private static final Logger LOG = LoggerFactory.getLogger(HBaseShellSessionManager.class); private final ConcurrentHashMap shellSessionMap; - private static volatile HBaseShellSessionManager instance = null; + private static volatile HBaseShellSessionManager instance = null; // NOSONAR private final ReentrantLock lock = new ReentrantLock(); @@ -39,8 +39,8 @@ private HBaseShellSessionManager() { public static HBaseShellSessionManager getInstance() { if (instance == null) { // NOSONAR - synchronized (HBaseShellSessionManager.class) { - if (instance == null) { + synchronized (HBaseShellSessionManager.class) { // NOSONAR + if (instance == null) { // NOSONAR instance = new HBaseShellSessionManager(); } } diff --git a/linkis-engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java b/linkis-engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java index 773dd28786..108ee2b101 100644 --- a/linkis-engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java +++ b/linkis-engineconn-plugins/jdbc/src/main/java/org/apache/linkis/manager/engineplugin/jdbc/ConnectionManager.java @@ -52,7 +52,7 @@ public class ConnectionManager { private final Map dataSourceFactories; private final JDBCDataSourceConfigurations jdbcDataSourceConfigurations; - private static volatile ConnectionManager connectionManager; + private static volatile ConnectionManager connectionManager; // NOSONAR private ScheduledExecutorService scheduledExecutorService; private Integer kinitFailCount = 0; @@ -63,8 +63,8 @@ private ConnectionManager() { public static ConnectionManager getInstance() { if (connectionManager == null) { // NOSONAR - synchronized (ConnectionManager.class) { - if (connectionManager == null) { + synchronized (ConnectionManager.class) { // NOSONAR + if (connectionManager == null) { // NOSONAR connectionManager = new ConnectionManager(); } } diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala index a7a274b84f..96ed51852c 100644 --- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala +++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/factory/SparkEngineConnFactory.scala @@ -255,11 +255,11 @@ class SparkEngineConnFactory extends MultiExecutorEngineConnFactory with Logging output }(t => { logger.warn("create spark repl classdir failed", t) - throw new SparkCreateFileException( + throw new SparkCreateFileException( // NOSONAR SPARK_CREATE_EXCEPTION.getErrorCode, SPARK_CREATE_EXCEPTION.getErrorDesc, t - ) // NOSONAR + ) null }) } diff --git a/linkis-extensions/linkis-et-monitor/src/main/java/org/apache/linkis/monitor/entity/ClientSingleton.java b/linkis-extensions/linkis-et-monitor/src/main/java/org/apache/linkis/monitor/entity/ClientSingleton.java index d55d0b9a27..3c660426b3 100644 --- a/linkis-extensions/linkis-et-monitor/src/main/java/org/apache/linkis/monitor/entity/ClientSingleton.java +++ b/linkis-extensions/linkis-et-monitor/src/main/java/org/apache/linkis/monitor/entity/ClientSingleton.java @@ -41,7 +41,7 @@ private ClientSingleton() {} public static synchronized MonitorHTTPClient getInstance() { if (instance == null) { if (dwsClientConfig == null) { - dwsClientConfig = createClientConfig(null, null); + dwsClientConfig = createClientConfig(null, null); // NOSONAR } instance = new MonitorHTTPClientClientImpl(dwsClientConfig); } @@ -61,7 +61,7 @@ public static DWSClientConfig createClientConfig(String url, Map } int maxConnection = (int) - parms.getOrDefault( + parms.getOrDefault( // NOSONAR BmlConfiguration.CONNECTION_MAX_SIZE_SHORT_NAME(), BmlConfiguration.CONNECTION_MAX_SIZE().getValue()); int connectTimeout = diff --git a/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java index 8f1c6b7438..da702a03d7 100644 --- a/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java +++ b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java @@ -99,13 +99,12 @@ public String convertHAIDToHAKey(HAContextID haContextID) throws CSErrorExceptio || StringUtils.isBlank(haContextID.getContextId())) { throw new CSErrorException( CSErrorCode.INVALID_HAID, - "Incomplete HAID Object cannot be encoded. mainInstance : " + haContextID == null - ? "NULL" - : haContextID.getInstance() + ", backupInstance : " + haContextID == null - ? "NULL" - : haContextID.getBackupInstance() + ", contextID : " + haContextID == null - ? "NULL" - : haContextID.getContextId()); + "Incomplete HAID Object cannot be encoded. mainInstance : " + + (haContextID == null ? "NULL" : haContextID.getInstance()) + + ", backupInstance : " + + (haContextID == null ? "NULL" : haContextID.getBackupInstance()) + + ", contextID : " + + (haContextID == null ? "NULL" : haContextID.getContextId())); } if (StringUtils.isNumeric(haContextID.getContextId())) { return encode(haContextID); diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml index 4154227902..ad77824778 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml @@ -49,13 +49,13 @@ org.apache.kafka kafka-clients + 2.7.0 org.xerial.snappy snappy-java - 2.7.0 org.xerial.snappy diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java index 2d4a63e327..b179a66560 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/DataSourceServiceImpl.java @@ -309,8 +309,8 @@ private void resetRootHdfs() { private FileSystem getRootHdfs() { if (rootHdfs == null) { // NOSONAR - synchronized (this) { - if (rootHdfs == null) { + synchronized (this) { // NOSONAR + if (rootHdfs == null) { // NOSONAR rootHdfs = HDFSUtils.getHDFSRootUserFileSystem(); KerberosUtils.startKerberosRefreshThread(); } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java index 335f3fcf6e..06388e615a 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java @@ -92,8 +92,8 @@ private HttpContextClient(ContextClientConfig contextClientConfig) { public static HttpContextClient getInstance(ContextClientConfig contextClientConfig) { if (httpContextClient == null) { // NOSONAR - synchronized (HttpContextClient.class) { - if (httpContextClient == null) { + synchronized (HttpContextClient.class) { // NOSONAR + if (httpContextClient == null) { // NOSONAR httpContextClient = new HttpContextClient(contextClientConfig); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java index 0f3120c671..9fc9637677 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java @@ -27,8 +27,8 @@ public class ContextClientListenerManager { public static ContextClientListenerBus getContextClientListenerBus() { if (contextClientListenerBus == null) { // NOSONAR - synchronized (ContextClientListenerManager.class) { - if (contextClientListenerBus == null) { + synchronized (ContextClientListenerManager.class) { // NOSONAR + if (contextClientListenerBus == null) { // NOSONAR contextClientListenerBus = new ContextClientListenerBus(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java index 75733ec0c7..703cf3a12d 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java @@ -42,8 +42,8 @@ private CSMetaDataService() {} public static CSMetaDataService getInstance() { if (null == csMetaDataService) { // NOSONAR - synchronized (CSMetaDataService.class) { - if (null == csMetaDataService) { + synchronized (CSMetaDataService.class) { // NOSONAR + if (null == csMetaDataService) { // NOSONAR csMetaDataService = new CSMetaDataService(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java index 9936aad3e9..4c84bae604 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java @@ -39,8 +39,8 @@ private CSNodeServiceImpl() {} public static CSNodeService getInstance() { if (null == csNodeService) { // NOSONAR - synchronized (CSNodeServiceImpl.class) { - if (null == csNodeService) { + synchronized (CSNodeServiceImpl.class) { // NOSONAR + if (null == csNodeService) { // NOSONAR csNodeService = new CSNodeServiceImpl(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java index 14920e57f5..7e23c043ce 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java @@ -44,8 +44,8 @@ private CSResourceService() {} public static CSResourceService getInstance() { if (null == csResourceService) { // NOSONAR - synchronized (CSResourceService.class) { - if (null == csResourceService) { + synchronized (CSResourceService.class) { // NOSONAR + if (null == csResourceService) { // NOSONAR csResourceService = new CSResourceService(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java index 738641a0e6..a2d280aad3 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java @@ -49,8 +49,8 @@ private CSResultDataServiceImpl() {} public static CSResultDataService getInstance() { if (null == csResultDataService) { // NOSONAR - synchronized (CSResultDataServiceImpl.class) { - if (null == csResultDataService) { + synchronized (CSResultDataServiceImpl.class) { // NOSONAR + if (null == csResultDataService) { // NOSONAR csResultDataService = new CSResultDataServiceImpl(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java index 2d342eec9f..130c273e40 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java @@ -55,8 +55,8 @@ private CSTableService() {} public static CSTableService getInstance() { if (null == csTableService) { // NOSONAR - synchronized (CSTableService.class) { - if (null == csTableService) { + synchronized (CSTableService.class) { // NOSONAR + if (null == csTableService) { // NOSONAR csTableService = new CSTableService(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java index afd424c4c6..425bd9798c 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java @@ -100,8 +100,8 @@ public void putVariable(String contextIDStr, String contextKeyStr, LinkisVariabl public static CSVariableService getInstance() { if (null == csVariableService) { // NOSONAR - synchronized (CSVariableService.class) { - if (null == csVariableService) { + synchronized (CSVariableService.class) { // NOSONAR + if (null == csVariableService) { // NOSONAR csVariableService = new CSVariableService(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java index 37ce4eb9f0..fc3720175b 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java @@ -42,8 +42,8 @@ private CSWorkServiceImpl() {} public static CSWorkService getInstance() { if (null == csWorkService) { // NOSONAR - synchronized (CSWorkServiceImpl.class) { - if (null == csWorkService) { + synchronized (CSWorkServiceImpl.class) { // NOSONAR + if (null == csWorkService) { // NOSONAR csWorkService = new CSWorkServiceImpl(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java index 1776e2d80c..63100fb7d1 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java @@ -45,8 +45,8 @@ private ContextHistoryClientServiceImpl() {} public static ContextHistoryClientService getInstance() { if (null == contextHistoryClientService) { // NOSONAR - synchronized (ContextHistoryClientServiceImpl.class) { - if (null == contextHistoryClientService) { + synchronized (ContextHistoryClientServiceImpl.class) { // NOSONAR + if (null == contextHistoryClientService) { // NOSONAR contextHistoryClientService = new ContextHistoryClientServiceImpl(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java index 1f0149bc22..b04bc59d9b 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java @@ -187,8 +187,8 @@ public List searchUpstreamKeyValue( public static SearchService getInstance() { if (null == searchService) { // SONAR - synchronized (DefaultSearchService.class) { - if (null == searchService) { + synchronized (DefaultSearchService.class) { // NOSONAR + if (null == searchService) { // NOSONAR searchService = new DefaultSearchService(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java index fe8298b4d0..83cb1dde25 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java @@ -46,8 +46,8 @@ private LinkisJobDataServiceImpl() {} public static LinkisJobDataService getInstance() { if (null == linkisJobDataService) { // NOSONAR - synchronized (LinkisJobDataServiceImpl.class) { - if (null == linkisJobDataService) { + synchronized (LinkisJobDataServiceImpl.class) { // NOSONAR + if (null == linkisJobDataService) { // NOSONAR linkisJobDataService = new LinkisJobDataServiceImpl(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java index 3fe661d735..8054485442 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java @@ -64,8 +64,8 @@ public class LinkisErrorCodeHandler public static LinkisErrorCodeHandler getInstance() { if (null == linkisErrorCodeHandler) { // NOSONAR - synchronized (LinkisErrorCodeHandler.class) { - if (null == linkisErrorCodeHandler) { + synchronized (LinkisErrorCodeHandler.class) { // NOSONAR + if (null == linkisErrorCodeHandler) { // NOSONAR linkisErrorCodeHandler = new LinkisErrorCodeHandler(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java index 6d05676a4b..ae587eb4c3 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java @@ -33,8 +33,8 @@ private LinkisErrorCodeManager() {} public static LinkisErrorCodeManager getInstance() { if (linkisErrorCodeManager == null) { // NOSONAR - synchronized (LinkisErrorCodeManager.class) { - if (linkisErrorCodeManager == null) { + synchronized (LinkisErrorCodeManager.class) { // NOSONAR + if (linkisErrorCodeManager == null) { // NOSONAR linkisErrorCodeManager = new LinkisErrorCodeManager(); } } diff --git a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java index 7861a40432..025483a75a 100644 --- a/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java +++ b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java @@ -84,8 +84,8 @@ private void init() { public static LinkisErrorCodeSynchronizer getInstance() { if (linkisErrorCodeSynchronizer == null) { // NOSONAR - synchronized (LinkisErrorCodeSynchronizer.class) { - if (linkisErrorCodeSynchronizer == null) { + synchronized (LinkisErrorCodeSynchronizer.class) { // NOSONAR + if (linkisErrorCodeSynchronizer == null) { // NOSONAR linkisErrorCodeSynchronizer = new LinkisErrorCodeSynchronizer(); } } diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java index 7d523d815b..253c7cf171 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java @@ -72,8 +72,8 @@ private void init() throws CSErrorException { public static ContextSerializationHelper getInstance() { if (contextSerializationHelper == null) { // NOSONAR - synchronized (ContextSerializationHelper.class) { - if (contextSerializationHelper == null) { + synchronized (ContextSerializationHelper.class) { // NOSONAR + if (contextSerializationHelper == null) { // NOSONAR contextSerializationHelper = new ContextSerializationHelper(); try { contextSerializationHelper.init(); diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java index f880c048c2..7ba05ad96f 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java @@ -44,8 +44,8 @@ public void doPostEvent(L listener, E event) { public static ContextAsyncListenerBus getInstance() { if (contextAsyncListenerBus == null) { // NOSONAR - synchronized (ContextAsyncListenerBus.class) { - if (contextAsyncListenerBus == null) { + synchronized (ContextAsyncListenerBus.class) { // NOSONAR + if (contextAsyncListenerBus == null) { // NOSONAR contextAsyncListenerBus = new ContextAsyncListenerBus(); contextAsyncListenerBus.start(); } diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java index 17ab7cf746..e0ade199a3 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java @@ -148,8 +148,8 @@ private DefaultContextIDCallbackEngine() {} public static DefaultContextIDCallbackEngine getInstance() { if (singleDefaultContextIDCallbackEngine == null) { // NOSONAR - synchronized (DefaultContextIDCallbackEngine.class) { - if (singleDefaultContextIDCallbackEngine == null) { + synchronized (DefaultContextIDCallbackEngine.class) { // NOSONAR + if (singleDefaultContextIDCallbackEngine == null) { // NOSONAR singleDefaultContextIDCallbackEngine = new DefaultContextIDCallbackEngine(); DefaultContextListenerManager instanceContextListenerManager = DefaultContextListenerManager.getInstance(); diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java index 7ce58f172a..bfa6ff5159 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java @@ -161,8 +161,8 @@ private DefaultContextKeyCallbackEngine() {} public static DefaultContextKeyCallbackEngine getInstance() { if (singleDefaultContextKeyCallbackEngine == null) { // NOSONAR - synchronized (DefaultContextKeyCallbackEngine.class) { - if (singleDefaultContextKeyCallbackEngine == null) { + synchronized (DefaultContextKeyCallbackEngine.class) { // NOSONAR + if (singleDefaultContextKeyCallbackEngine == null) { // NOSONAR singleDefaultContextKeyCallbackEngine = new DefaultContextKeyCallbackEngine(); DefaultContextListenerManager instanceContextListenerManager = DefaultContextListenerManager.getInstance(); diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java index 38295441d0..6dddb464b8 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java @@ -49,8 +49,8 @@ private DefaultContextListenerManager() {} public static DefaultContextListenerManager getInstance() { if (singleDefaultContextListenerManager == null) { // NOSONAR - synchronized (DefaultContextListenerManager.class) { - if (singleDefaultContextListenerManager == null) { + synchronized (DefaultContextListenerManager.class) { // NOSONAR + if (singleDefaultContextListenerManager == null) { // NOSONAR singleDefaultContextListenerManager = new DefaultContextListenerManager(); } } diff --git a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java index 3f2863758d..914f9f0376 100644 --- a/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java @@ -30,8 +30,8 @@ private ConnCacheManager() {} public static CacheManager custom() { if (null == manager) { // NOSONAR - synchronized (ConnCacheManager.class) { - if (null == manager) { + synchronized (ConnCacheManager.class) { // NOSONAR + if (null == manager) { // NOSONAR manager = new ConnCacheManager(); } } diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/FilesystemUtils.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/FilesystemUtils.java index 3954e210f6..7136b07b3d 100644 --- a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/FilesystemUtils.java +++ b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/util/FilesystemUtils.java @@ -152,6 +152,7 @@ private static InputStream createZipFile(InputStream inputStream, String folder, if (!entry.isDirectory() && entry.getName().contains(FsPath.SEPARATOR + folder + FsPath.SEPARATOR)) { // \dist\py_mysql-1.0.tar\py_mysql-1.0\py_mysql\lib\__init__.py + assert rootPath != null; ZipEntry zipEntry = new ZipEntry(entry.getName().substring(rootPath.length())); zos.putNextEntry(zipEntry); IOUtils.copy(tarInput, zos); diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/dss/parser/DSSRouteLabelParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/dss/parser/DSSRouteLabelParser.scala index ddf87c3258..cea33949ff 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/dss/parser/DSSRouteLabelParser.scala +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/dss/parser/DSSRouteLabelParser.scala @@ -49,7 +49,7 @@ class DSSRouteLabelParser extends RouteLabelParser { requestBody match { // todo form-data resolve case Some(body) => - if (body.contains("form-data")) {} else { +// if (body.contains("form-data")) {} else { // val labelBuilderFactory = LabelBuilderFactoryContext.getLabelBuilderFactory // val json = BDPJettyServerHelper.gson.fromJson(body, classOf[java.util.Map[String, Object]]) // val labels: util.List[Label[_]] = json.get(TaskConstant.LABELS) match { @@ -60,7 +60,7 @@ class DSSRouteLabelParser extends RouteLabelParser { // labels.filter(label => label.isInstanceOf[RouteLabel]).foreach(label => { // routeLabelList.add(label.asInstanceOf[RouteLabel]) // }) - } +// } case _ => null } }