From 5f5477ecaf576889750c364f2f65e4e7cb39fc34 Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Wed, 5 Sep 2018 16:43:09 -0400 Subject: [PATCH 1/1] Fixes for security voilations Issue-ID: DMAAP-738 Change-Id: I810dad9d71f6518025eb69f9f4c982da15badcbf Signed-off-by: sunil unnava --- pom.xml | 22 +++---- .../backends/kafka/CuratorFrameworkImpl.java | 75 ++++++++++++++++++++++ 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 1b1dabd..d9867b0 100644 --- a/pom.xml +++ b/pom.xml @@ -245,11 +245,6 @@ cxf-rt-transports-http-jetty ${cxf.version} --> - - org.springframework - spring-core - ${spring.version} - org.springframework spring-context @@ -258,17 +253,17 @@ org.springframework spring-expression - 4.3.16.RELEASE + 4.3.18.RELEASE org.springframework spring-webmvc - 4.3.15.RELEASE + 4.3.18.RELEASE org.springframework spring-core - 4.3.15.RELEASE + 4.3.18.RELEASE javax.servlet @@ -306,8 +301,13 @@ org.apache.kafka kafka_2.11 - 0.11.0.0 + 0.11.0.2 + + com.google.guava + guava + 23.1-jre + com.att.eelf @@ -388,13 +388,13 @@ org.apache.curator curator-recipes - 2.6.0 + 4.0.1 org.apache.curator curator-test - 2.6.0 + 4.0.1 diff --git a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java b/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java index 64e128c..a12e96c 100644 --- a/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java +++ b/src/test/java/com/att/nsa/cambria/backends/kafka/CuratorFrameworkImpl.java @@ -24,23 +24,32 @@ import java.util.concurrent.TimeUnit; import org.apache.curator.CuratorZookeeperClient; import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.WatcherRemoveCuratorFramework; import org.apache.curator.framework.api.CreateBuilder; import org.apache.curator.framework.api.CuratorListener; import org.apache.curator.framework.api.DeleteBuilder; import org.apache.curator.framework.api.ExistsBuilder; import org.apache.curator.framework.api.GetACLBuilder; import org.apache.curator.framework.api.GetChildrenBuilder; +import org.apache.curator.framework.api.GetConfigBuilder; import org.apache.curator.framework.api.GetDataBuilder; +import org.apache.curator.framework.api.ReconfigBuilder; +import org.apache.curator.framework.api.RemoveWatchesBuilder; import org.apache.curator.framework.api.SetACLBuilder; import org.apache.curator.framework.api.SetDataBuilder; import org.apache.curator.framework.api.SyncBuilder; import org.apache.curator.framework.api.UnhandledErrorListener; +import org.apache.curator.framework.api.transaction.CuratorMultiTransaction; import org.apache.curator.framework.api.transaction.CuratorTransaction; +import org.apache.curator.framework.api.transaction.TransactionOp; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.curator.framework.listen.Listenable; +import org.apache.curator.framework.schema.SchemaSet; +import org.apache.curator.framework.state.ConnectionStateErrorPolicy; import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.utils.EnsurePath; import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; public class CuratorFrameworkImpl implements CuratorFramework { @@ -200,4 +209,70 @@ public class CuratorFrameworkImpl implements CuratorFramework { return null; } + @Override + public ReconfigBuilder reconfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public GetConfigBuilder getConfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CuratorMultiTransaction transaction() { + // TODO Auto-generated method stub + return null; + } + + @Override + public TransactionOp transactionOp() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void createContainers(String path) throws Exception { + // TODO Auto-generated method stub + + } + + @Override + public RemoveWatchesBuilder watches() { + // TODO Auto-generated method stub + return null; + } + + @Override + public WatcherRemoveCuratorFramework newWatcherRemoveCuratorFramework() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ConnectionStateErrorPolicy getConnectionStateErrorPolicy() { + // TODO Auto-generated method stub + return null; + } + + @Override + public QuorumVerifier getCurrentConfig() { + // TODO Auto-generated method stub + return null; + } + + @Override + public SchemaSet getSchemaSet() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isZk34CompatibilityMode() { + // TODO Auto-generated method stub + return false; + } + } -- 2.16.6