Skip to content

Commit b0b354c

Browse files
committed
SpotlessApply
Signed-off-by: Peter Nied <peternied@hotmail.com>
1 parent 5dc47ba commit b0b354c

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

src/main/java/org/opensearch/security/filter/NettyRequest.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@
2020
import java.util.Optional;
2121
import java.util.Set;
2222
import java.util.TreeMap;
23-
import java.util.stream.Collector;
24-
import java.util.stream.Collectors;
25-
2623
import javax.net.ssl.SSLEngine;
2724

28-
import org.apache.commons.lang3.concurrent.ConcurrentException;
29-
import org.apache.commons.lang3.concurrent.LazyInitializer;
30-
import org.opensearch.http.netty4.Netty4HttpChannel;
31-
import org.opensearch.rest.RestRequest.Method;
32-
3325
import com.google.common.base.Supplier;
3426
import com.google.common.base.Suppliers;
3527

28+
import org.opensearch.http.netty4.Netty4HttpChannel;
29+
import org.opensearch.rest.RestRequest.Method;
3630
import org.opensearch.rest.RestUtils;
3731

3832
import io.netty.handler.codec.http.HttpRequest;
@@ -130,7 +124,7 @@ public CheckedAccessMap(final Map<String, String> map) {
130124
public String get(final Object key) {
131125
// Never noticed this about java's map interface the getter is not generic
132126
if (key instanceof String) {
133-
accessedKeys.add((String)key);
127+
accessedKeys.add((String) key);
134128
}
135129
return super.get(key);
136130
}

src/main/java/org/opensearch/security/filter/OpenSearchRequest.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Map;
1818
import java.util.Optional;
1919
import java.util.Set;
20-
2120
import javax.net.ssl.SSLEngine;
2221

2322
import org.opensearch.rest.RestRequest;
@@ -86,7 +85,6 @@ public Set<String> getUnconsumedParams() {
8685
return Set.of();
8786
}
8887

89-
9088
/** Gets access to the underlying request object */
9189
public RestRequest breakEncapsulationForRequest() {
9290
return underlyingRequest;

src/main/java/org/opensearch/security/filter/SecurityRestFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969

7070
import static org.opensearch.security.OpenSearchSecurityPlugin.LEGACY_OPENDISTRO_PREFIX;
7171
import static org.opensearch.security.OpenSearchSecurityPlugin.PLUGINS_PREFIX;
72-
import static org.opensearch.security.http.SecurityHttpServerTransport.UNCONSUMED_PARAMS;
7372
import static org.opensearch.security.http.SecurityHttpServerTransport.CONTEXT_TO_RESTORE;
7473
import static org.opensearch.security.http.SecurityHttpServerTransport.EARLY_RESPONSE;
7574
import static org.opensearch.security.http.SecurityHttpServerTransport.IS_AUTHENTICATED;
75+
import static org.opensearch.security.http.SecurityHttpServerTransport.UNCONSUMED_PARAMS;
7676

7777
public class SecurityRestFilter {
7878

src/main/java/org/opensearch/security/ssl/http/netty/Netty4HttpRequestHeaderVerifier.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.opensearch.common.util.concurrent.ThreadContext;
1515
import org.opensearch.http.netty4.Netty4HttpChannel;
1616
import org.opensearch.http.netty4.Netty4HttpServerTransport;
17-
import org.opensearch.security.filter.NettyRequest;
1817
import org.opensearch.security.filter.SecurityRequestChannel;
1918
import org.opensearch.security.filter.SecurityRequestChannelUnsupported;
2019
import org.opensearch.security.filter.SecurityRequestFactory;
@@ -33,11 +32,11 @@
3332
import io.netty.handler.codec.http.HttpRequest;
3433
import io.netty.util.ReferenceCountUtil;
3534

36-
import static org.opensearch.security.http.SecurityHttpServerTransport.UNCONSUMED_PARAMS;
3735
import static org.opensearch.security.http.SecurityHttpServerTransport.CONTEXT_TO_RESTORE;
3836
import static org.opensearch.security.http.SecurityHttpServerTransport.EARLY_RESPONSE;
3937
import static org.opensearch.security.http.SecurityHttpServerTransport.IS_AUTHENTICATED;
4038
import static org.opensearch.security.http.SecurityHttpServerTransport.SHOULD_DECOMPRESS;
39+
import static org.opensearch.security.http.SecurityHttpServerTransport.UNCONSUMED_PARAMS;
4140

4241
@Sharable
4342
public class Netty4HttpRequestHeaderVerifier extends SimpleChannelInboundHandler<DefaultHttpRequest> {

0 commit comments

Comments
 (0)