Skip to content

Commit da8aee6

Browse files
author
Junjie Chen
committed
[Spark-13331] Spark RPC encryption optimization
Remove some unnecessary import and changes.
1 parent 78f4d7b commit da8aee6

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

common/network-common/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
<artifactId>guava</artifactId>
7777
<scope>compile</scope>
7878
</dependency>
79+
<dependency>
80+
<groupId>org.apache.commons</groupId>
81+
<artifactId>commons-crypto</artifactId>
82+
<version>${commons-crypto.version}</version>
83+
</dependency>
7984

8085
<!-- Test dependencies -->
8186
<dependency>
@@ -97,11 +102,6 @@
97102
<artifactId>slf4j-log4j12</artifactId>
98103
<scope>test</scope>
99104
</dependency>
100-
<dependency>
101-
<groupId>org.apache.commons</groupId>
102-
<artifactId>commons-crypto</artifactId>
103-
<version>${commons-crypto.version}</version>
104-
</dependency>
105105
</dependencies>
106106

107107
<build>

common/network-common/src/main/java/org/apache/spark/network/sasl/SaslServerBootstrap.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* authentication.
3030
*/
3131
public class SaslServerBootstrap implements TransportServerBootstrap {
32+
3233
private final TransportConf conf;
3334
private final SecretKeyHolder secretKeyHolder;
3435

common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
package org.apache.spark.network.util;
1919

2020
import com.google.common.primitives.Ints;
21-
import io.netty.handler.ssl.CipherSuiteFilter;
22-
import org.apache.commons.crypto.cipher.CryptoCipherFactory;
21+
2322
/**
2423
* A central location that tracks all the settings we expose to users.
2524
*/

common/network-common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import io.netty.channel.ChannelHandlerContext;
4242
import io.netty.channel.ChannelOutboundHandlerAdapter;
4343
import io.netty.channel.ChannelPromise;
44-
import org.apache.spark.network.sasl.aes.SparkAesCipher;
4544
import org.junit.Test;
4645
import org.mockito.invocation.InvocationOnMock;
4746
import org.mockito.stubbing.Answer;
@@ -54,6 +53,7 @@
5453
import org.apache.spark.network.client.RpcResponseCallback;
5554
import org.apache.spark.network.client.TransportClient;
5655
import org.apache.spark.network.client.TransportClientBootstrap;
56+
import org.apache.spark.network.sasl.aes.SparkAesCipher;
5757
import org.apache.spark.network.server.RpcHandler;
5858
import org.apache.spark.network.server.StreamManager;
5959
import org.apache.spark.network.server.TransportServer;

0 commit comments

Comments
 (0)