Skip to content

Commit cf86065

Browse files
Removing Netty4 local copy and consume from Maven (#76)
* Removing Netty4 local copy and consume from Maven Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Removing from spotless exclusion Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Removing from JavaDocs Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Addressing comments Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
1 parent 19fae1a commit cf86065

17 files changed

Lines changed: 5 additions & 2030 deletions

build.gradle

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,14 @@ configurations {
4444

4545
dependencies {
4646
implementation "org.opensearch:opensearch:3.0.0-SNAPSHOT"
47+
implementation "org.opensearch.plugin:transport-netty4-client:3.0.0-SNAPSHOT"
4748
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
4849
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
4950
implementation "io.netty:netty-all:4.1.73.Final"
5051
testCompileOnly ("junit:junit:4.13.2") {
5152
exclude module : 'hamcrest'
5253
exclude module : 'hamcrest-core'
5354
}
54-
// Keeping it for now. Will remove it later once figure out the right dependencies
55-
// implementation "io.netty:netty-buffer:4.1.73.Final"
56-
// implementation "io.netty:netty-codec:4.1.73.Final"
57-
// implementation "io.netty:netty-codec-http:4.1.73.Final"
58-
// implementation "io.netty:netty-common:4.1.73.Final"
59-
// implementation "io.netty:netty-handler:4.1.73.Final"
60-
// implementation "io.netty:netty-resolver:4.1.73.Final"
61-
// implementation "io.netty:netty-transportservice.transport:4.1.73.Final"
62-
//implementation "org.apache.logging.log4j:log4j-1.2-api:2.17.1"
6355
implementation 'javax.xml.bind:jaxb-api:2.2.2'
6456
implementation 'com.fasterxml.jackson.core:jackson-databind: 2.12.6.1'
6557
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml: 2.12.6.1'
@@ -80,9 +72,6 @@ task requireJavadoc(type: JavaExec) {
8072
args "--dont-require-private=true"
8173
// javadocs on trivial getters/setters optional
8274
args "--dont-require-trivial-properties"
83-
// the netty4 package will eventually be published to mavenCentral
84-
// See https://github.com/opensearch-project/OpenSearch/issues/3118
85-
args "--exclude=netty4"
8675
}
8776
check.dependsOn requireJavadoc
8877

gradle/formatting.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ allprojects {
2525
format("license", {
2626
licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package ");
2727
target("src/main/java/**/*.java")
28-
targetExclude("**/netty4/*")
2928
})
3029
}
3130
}

src/main/java/org/opensearch/sdk/ExtensionsRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import org.opensearch.indices.IndicesModule;
3131
import org.opensearch.indices.breaker.CircuitBreakerService;
3232
import org.opensearch.indices.breaker.NoneCircuitBreakerService;
33+
import org.opensearch.transport.netty4.Netty4Transport;
34+
import org.opensearch.transport.SharedGroupFactory;
3335
import org.opensearch.sdk.handlers.ClusterSettingsResponseHandler;
3436
import org.opensearch.sdk.handlers.ClusterStateResponseHandler;
3537
import org.opensearch.sdk.handlers.LocalNodeResponseHandler;
36-
import org.opensearch.sdk.netty4.Netty4Transport;
37-
import org.opensearch.sdk.netty4.SharedGroupFactory;
3838
import org.opensearch.search.SearchModule;
3939
import org.opensearch.threadpool.ThreadPool;
4040
import org.opensearch.transport.ClusterConnectionManager;

src/main/java/org/opensearch/sdk/netty4/CopyBytesServerSocketChannel.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/main/java/org/opensearch/sdk/netty4/CopyBytesSocketChannel.java

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)