From 679c7b7c35dd112977815de5abebc6e077ecc044 Mon Sep 17 00:00:00 2001 From: Tom Kaitchuck Date: Mon, 21 Jan 2019 12:53:46 -0800 Subject: [PATCH] Issue #3299: Reduce dependencies in client (#3300) - Reduce overly broad scope of dependencies on Netty and Grpc in the client. - Remove unneeded dependency on Apache Curator. Signed-off-by: Tom Kaitchuck --- build.gradle | 20 +++++++++++-------- settings.gradle | 2 +- .../io/pravega/common/cluster/Cluster.java | 0 .../common/cluster/ClusterException.java | 0 .../common/cluster/ClusterListener.java | 0 .../pravega/common/cluster/ClusterType.java | 0 .../java/io/pravega/common/cluster/Host.java | 0 .../common/cluster/zkImpl/ClusterZKImpl.java | 0 .../common/cluster/zkImpl/ClusterZKTest.java | 0 .../java/io/pravega/shared/NameUtils.java | 0 .../segment/SegmentToContainerMapper.java | 0 .../segment/StreamSegmentNameUtils.java | 0 .../java/io/pravega/shared/NameUtilsTest.java | 0 .../SegmentToContainerMapperTests.java | 0 .../segment/StreamSegmentNameUtilsTests.java | 0 15 files changed, 13 insertions(+), 9 deletions(-) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/Cluster.java (100%) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/ClusterException.java (100%) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/ClusterListener.java (100%) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/ClusterType.java (100%) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/Host.java (100%) rename shared/{ => cluster}/src/main/java/io/pravega/common/cluster/zkImpl/ClusterZKImpl.java (100%) rename shared/{ => cluster}/src/test/java/io/pravega/common/cluster/zkImpl/ClusterZKTest.java (100%) rename shared/{ => protocol}/src/main/java/io/pravega/shared/NameUtils.java (100%) rename shared/{ => protocol}/src/main/java/io/pravega/shared/segment/SegmentToContainerMapper.java (100%) rename shared/{ => protocol}/src/main/java/io/pravega/shared/segment/StreamSegmentNameUtils.java (100%) rename shared/{ => protocol}/src/test/java/io/pravega/shared/NameUtilsTest.java (100%) rename shared/{ => protocol}/src/test/java/io/pravega/shared/segment/SegmentToContainerMapperTests.java (100%) rename shared/{ => protocol}/src/test/java/io/pravega/shared/segment/StreamSegmentNameUtilsTests.java (100%) diff --git a/build.gradle b/build.gradle index b49c85972d3..5ba84c4688e 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ project('shared:authplugin') { } } -project ('shared') { +project ('shared:cluster') { dependencies { compile project(':common') compile group: 'com.google.guava', name: 'guava', version: guavaVersion @@ -174,19 +174,21 @@ project ('shared:metrics') { project('shared:protocol') { dependencies { - compile group: 'io.netty', name: 'netty-all', version: nettyVersion + compile project(':common') + compile group: 'io.netty', name: 'netty-transport', version: nettyVersion + compile group: 'io.netty', name: 'netty-handler', version: nettyVersion compile group: 'com.google.guava', name: 'guava', version: guavaVersion + testCompile project(':test:testcommon') } } project('client') { dependencies { compile project(':common') - compile project(':shared') compile project(':shared:authplugin') compile project(':shared:protocol') compile project(":shared:controller-api") - compile group: 'io.netty', name: 'netty-all', version: nettyVersion + compile group: 'io.netty', name: 'netty-transport-native-epoll', version: nettyVersion compile group: 'com.google.guava', name: 'guava', version: guavaVersion testCompile project(':test:testcommon') testCompile group: 'org.slf4j', name: 'log4j-over-slf4j', version: slf4jApiVersion @@ -221,7 +223,7 @@ project('segmentstore:contracts') { project('segmentstore:storage') { dependencies { compile project(':common') - compile project(':shared') + compile project(':shared:protocol') compile project(':segmentstore:contracts') compile project(':shared:metrics') testCompile project(':test:testcommon') @@ -233,6 +235,7 @@ project('segmentstore:storage:impl') { compile project(':common') compile project(':segmentstore:storage') compile project(':shared:metrics') + compile group: 'org.apache.curator', name: 'curator-framework', version: apacheCuratorVersion compile group: 'org.apache.bookkeeper', name: 'bookkeeper-server', version: bookKeeperVersion, withoutLogger compile group: 'org.rocksdb', name: 'rocksdbjni', version: rocksdbjniVersion testCompile project(':test:testcommon') @@ -266,7 +269,6 @@ project ('bindings') { project('segmentstore:server') { dependencies { compile project(':common') - compile project(':shared') compile project(':segmentstore:contracts') compile project(':segmentstore:storage') compile project(':shared:metrics') @@ -302,6 +304,7 @@ project('segmentstore:server:host') { dependencies { compile project(':common') compile project(":shared:authplugin") + compile project(':shared:cluster') compile project(':segmentstore:contracts') compile project(':client') compile project(':segmentstore:storage') @@ -454,7 +457,7 @@ project('shared:controller-api') { compile group: 'io.netty', name: 'netty-all', version: nettyVersion compile "io.grpc:grpc-netty:" + grpcVersion - compile "io.grpc:grpc-all:" + grpcVersion + compile "io.grpc:grpc-auth:" + grpcVersion compile "io.grpc:grpc-protobuf:" + grpcVersion compile "io.grpc:grpc-stub:" + grpcVersion compile group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: nettyBoringSSLVersion @@ -506,8 +509,9 @@ project('controller') { dependencies { compile project(':common') - compile project(":shared:controller-api") compile project(":shared:authplugin") + compile project(":shared:controller-api") + compile project(':shared:cluster') compile project(":client") compile project(":shared:metrics") runtime group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion diff --git a/settings.gradle b/settings.gradle index fe52d4b5b46..7b8047f042b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ rootProject.name = 'pravega' include 'common', - 'shared', + 'shared:cluster', 'shared:authplugin', 'shared:metrics', 'shared:protocol', diff --git a/shared/src/main/java/io/pravega/common/cluster/Cluster.java b/shared/cluster/src/main/java/io/pravega/common/cluster/Cluster.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/Cluster.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/Cluster.java diff --git a/shared/src/main/java/io/pravega/common/cluster/ClusterException.java b/shared/cluster/src/main/java/io/pravega/common/cluster/ClusterException.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/ClusterException.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/ClusterException.java diff --git a/shared/src/main/java/io/pravega/common/cluster/ClusterListener.java b/shared/cluster/src/main/java/io/pravega/common/cluster/ClusterListener.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/ClusterListener.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/ClusterListener.java diff --git a/shared/src/main/java/io/pravega/common/cluster/ClusterType.java b/shared/cluster/src/main/java/io/pravega/common/cluster/ClusterType.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/ClusterType.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/ClusterType.java diff --git a/shared/src/main/java/io/pravega/common/cluster/Host.java b/shared/cluster/src/main/java/io/pravega/common/cluster/Host.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/Host.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/Host.java diff --git a/shared/src/main/java/io/pravega/common/cluster/zkImpl/ClusterZKImpl.java b/shared/cluster/src/main/java/io/pravega/common/cluster/zkImpl/ClusterZKImpl.java similarity index 100% rename from shared/src/main/java/io/pravega/common/cluster/zkImpl/ClusterZKImpl.java rename to shared/cluster/src/main/java/io/pravega/common/cluster/zkImpl/ClusterZKImpl.java diff --git a/shared/src/test/java/io/pravega/common/cluster/zkImpl/ClusterZKTest.java b/shared/cluster/src/test/java/io/pravega/common/cluster/zkImpl/ClusterZKTest.java similarity index 100% rename from shared/src/test/java/io/pravega/common/cluster/zkImpl/ClusterZKTest.java rename to shared/cluster/src/test/java/io/pravega/common/cluster/zkImpl/ClusterZKTest.java diff --git a/shared/src/main/java/io/pravega/shared/NameUtils.java b/shared/protocol/src/main/java/io/pravega/shared/NameUtils.java similarity index 100% rename from shared/src/main/java/io/pravega/shared/NameUtils.java rename to shared/protocol/src/main/java/io/pravega/shared/NameUtils.java diff --git a/shared/src/main/java/io/pravega/shared/segment/SegmentToContainerMapper.java b/shared/protocol/src/main/java/io/pravega/shared/segment/SegmentToContainerMapper.java similarity index 100% rename from shared/src/main/java/io/pravega/shared/segment/SegmentToContainerMapper.java rename to shared/protocol/src/main/java/io/pravega/shared/segment/SegmentToContainerMapper.java diff --git a/shared/src/main/java/io/pravega/shared/segment/StreamSegmentNameUtils.java b/shared/protocol/src/main/java/io/pravega/shared/segment/StreamSegmentNameUtils.java similarity index 100% rename from shared/src/main/java/io/pravega/shared/segment/StreamSegmentNameUtils.java rename to shared/protocol/src/main/java/io/pravega/shared/segment/StreamSegmentNameUtils.java diff --git a/shared/src/test/java/io/pravega/shared/NameUtilsTest.java b/shared/protocol/src/test/java/io/pravega/shared/NameUtilsTest.java similarity index 100% rename from shared/src/test/java/io/pravega/shared/NameUtilsTest.java rename to shared/protocol/src/test/java/io/pravega/shared/NameUtilsTest.java diff --git a/shared/src/test/java/io/pravega/shared/segment/SegmentToContainerMapperTests.java b/shared/protocol/src/test/java/io/pravega/shared/segment/SegmentToContainerMapperTests.java similarity index 100% rename from shared/src/test/java/io/pravega/shared/segment/SegmentToContainerMapperTests.java rename to shared/protocol/src/test/java/io/pravega/shared/segment/SegmentToContainerMapperTests.java diff --git a/shared/src/test/java/io/pravega/shared/segment/StreamSegmentNameUtilsTests.java b/shared/protocol/src/test/java/io/pravega/shared/segment/StreamSegmentNameUtilsTests.java similarity index 100% rename from shared/src/test/java/io/pravega/shared/segment/StreamSegmentNameUtilsTests.java rename to shared/protocol/src/test/java/io/pravega/shared/segment/StreamSegmentNameUtilsTests.java