Merge pull request #301 from finos/main-6.2

[*] remove snmp from client
finos · Dec 3, 2024 · 1c62cce · 1c62cce
2 parents e1d61cb + f6c08b0
commit 1c62cce
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 354 deletions.
diff --git a/java/timebase/commons/build.gradle b/java/timebase/commons/build.gradle
@@ -5,7 +5,7 @@ description = "Timebase Commons Server API Library"
 
 dependencies {
     api project(':java:timebase:pub')
-    api project(':java:timebase:snmpagent')
+    //implementation project(':java:timebase:snmpagent')
 
     api ('com.epam.deltix:timebase-lang')
     api ('com.epam.deltix:timebase-util')
@@ -37,6 +37,11 @@ dependencies {
 
     implementation 'com.github.sarxos:windows-registry-util:0.3'
 
+    implementation 'com.bettercloud:vault-java-driver'
+
+    implementation 'com.azure:azure-identity'
+    implementation 'com.azure:azure-security-keyvault-secrets'
+
     implementation 'com.epam.deltix:gflog-api',
             'com.epam.deltix:gflog-core',
             'com.epam.deltix:gflog-jul',

diff --git a/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/comm/cat/TomcatRunner.java b/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/comm/cat/TomcatRunner.java
@@ -21,13 +21,10 @@
 import com.epam.deltix.qsrv.config.QuantServiceConfig.Type;
 import com.epam.deltix.qsrv.config.ServiceExecutor;
 import com.epam.deltix.qsrv.util.servlet.AccessFilter;
-import com.epam.deltix.snmp.QuantServerSnmpObjectContainer;
-import com.epam.deltix.snmp.SNMPTransportFactory;
 import com.epam.deltix.qsrv.util.tomcat.DXTomcat;
 import com.epam.deltix.util.collections.generated.ObjectArrayList;
 import com.epam.deltix.util.io.Home;
 import com.epam.deltix.util.lang.Util;
-import com.epam.deltix.util.tomcat.ConnectionHandshakeHandler;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 

diff --git a/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/config/ServiceExecutor.java b/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/config/ServiceExecutor.java
@@ -16,7 +16,6 @@
  */
 package com.epam.deltix.qsrv.config;
 
-import com.epam.deltix.snmp.QuantServerSnmpObjectContainer;
 import org.apache.catalina.Context;
 
 import java.io.Closeable;
@@ -35,10 +34,10 @@ public interface ServiceExecutor extends Closeable {
      */
     void    configure(Context context);
 
-    /**
-     * Implementors for this method may put own SNMP data objects into provided {@code snmpContextHolder}.
-     * @param snmpContextHolder container for SNMP data objects
-     */
-    default void registerSnmpObjects(QuantServerSnmpObjectContainer snmpContextHolder) {
-    }
+//    /**
+//     * Implementors for this method may put own SNMP data objects into provided {@code snmpContextHolder}.
+//     * @param snmpContextHolder container for SNMP data objects
+//     */
+//    default void registerSnmpObjects(QuantServerSnmpObjectContainer snmpContextHolder) {
+//    }
 }
diff --git a/...x/qsrv/util/secrets/AzureVaultConfig.java → ...x/qsrv/util/secrets/AzureVaultConfig.java b/...x/qsrv/util/secrets/AzureVaultConfig.java → ...x/qsrv/util/secrets/AzureVaultConfig.java
diff --git a/.../qsrv/util/secrets/AzureVaultStorage.java → .../qsrv/util/secrets/AzureVaultStorage.java b/.../qsrv/util/secrets/AzureVaultStorage.java → .../qsrv/util/secrets/AzureVaultStorage.java
diff --git a/...rv/util/secrets/HashicorpVaultConfig.java → ...rv/util/secrets/HashicorpVaultConfig.java b/...rv/util/secrets/HashicorpVaultConfig.java → ...rv/util/secrets/HashicorpVaultConfig.java
diff --git a/...v/util/secrets/HashicorpVaultStorage.java → ...v/util/secrets/HashicorpVaultStorage.java b/...v/util/secrets/HashicorpVaultStorage.java → ...v/util/secrets/HashicorpVaultStorage.java
diff --git a/...tix/qsrv/util/secrets/SecretsStorage.java → ...tix/qsrv/util/secrets/SecretsStorage.java b/...tix/qsrv/util/secrets/SecretsStorage.java → ...tix/qsrv/util/secrets/SecretsStorage.java
diff --git a/...rv/util/secrets/SecretsStorageConfig.java → ...rv/util/secrets/SecretsStorageConfig.java b/...rv/util/secrets/SecretsStorageConfig.java → ...rv/util/secrets/SecretsStorageConfig.java
diff --git a/...deltix/qsrv/util/secrets/VaultConfig.java → ...deltix/qsrv/util/secrets/VaultConfig.java b/...deltix/qsrv/util/secrets/VaultConfig.java → ...deltix/qsrv/util/secrets/VaultConfig.java
diff --git a/.../qsrv/util/secrets/VaultProviderType.java → .../qsrv/util/secrets/VaultProviderType.java b/.../qsrv/util/secrets/VaultProviderType.java → .../qsrv/util/secrets/VaultProviderType.java
diff --git a/...eltix/qsrv/util/secrets/VaultStorage.java → ...eltix/qsrv/util/secrets/VaultStorage.java b/...eltix/qsrv/util/secrets/VaultStorage.java → ...eltix/qsrv/util/secrets/VaultStorage.java
diff --git a/...srv/util/secrets/VaultStorageFactory.java → ...srv/util/secrets/VaultStorageFactory.java b/...srv/util/secrets/VaultStorageFactory.java → ...srv/util/secrets/VaultStorageFactory.java
diff --git a/java/timebase/commons/src/main/java/com/epam/deltix/snmp/QuantServerSnmpObjectContainer.java b/java/timebase/commons/src/main/java/com/epam/deltix/snmp/QuantServerSnmpObjectContainer.java
diff --git a/java/timebase/commons/src/main/java/com/epam/deltix/snmp/SNMPTransportFactory.java b/java/timebase/commons/src/main/java/com/epam/deltix/snmp/SNMPTransportFactory.java