mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Remove Guava types from public interfaces 

References #273.
pull/273/merge
Andrew Gaul 2018-04-21 18:08:21 -07:00
rodzic 86e1302bc9
commit ec00aeb8cd
3 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/main/java/org/gaul/s3proxy/S3Proxy.java
Wyświetl plik

@ -25,7 +25,6 @@ import java.net.URISyntaxException;
import java.util.Objects; import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import com.google.common.base.Optional;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.HttpConnectionFactory;
@ -113,7 +112,7 @@ public final class S3Proxy {
} }
handler = new S3ProxyHandlerJetty(builder.blobStore, handler = new S3ProxyHandlerJetty(builder.blobStore,
builder.authenticationType, builder.identity, builder.authenticationType, builder.identity,
builder.credential, Optional.fromNullable(builder.virtualHost), builder.credential, builder.virtualHost,
builder.v4MaxNonChunkedRequestSize, builder.v4MaxNonChunkedRequestSize,
builder.ignoreUnknownHeaders, builder.corsAllowAll, builder.ignoreUnknownHeaders, builder.corsAllowAll,
builder.servicePath); builder.servicePath);

6
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -16,8 +16,6 @@
package org.gaul.s3proxy; package org.gaul.s3proxy;
import static java.util.Objects.requireNonNull;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FilterInputStream; import java.io.FilterInputStream;
@ -214,7 +212,7 @@ public class S3ProxyHandler {
public S3ProxyHandler(final BlobStore blobStore, public S3ProxyHandler(final BlobStore blobStore,
AuthenticationType authenticationType, final String identity, AuthenticationType authenticationType, final String identity,
final String credential, Optional<String> virtualHost, final String credential, @Nullable String virtualHost,
long v4MaxNonChunkedRequestSize, boolean ignoreUnknownHeaders, long v4MaxNonChunkedRequestSize, boolean ignoreUnknownHeaders,
boolean corsAllowAll, final String servicePath) { boolean corsAllowAll, final String servicePath) {
if (authenticationType != AuthenticationType.NONE) { if (authenticationType != AuthenticationType.NONE) {
@ -243,7 +241,7 @@ public class S3ProxyHandler {
}; };
} }
this.authenticationType = authenticationType; this.authenticationType = authenticationType;
this.virtualHost = requireNonNull(virtualHost); this.virtualHost = Optional.fromNullable(virtualHost);
this.v4MaxNonChunkedRequestSize = v4MaxNonChunkedRequestSize; this.v4MaxNonChunkedRequestSize = v4MaxNonChunkedRequestSize;
this.ignoreUnknownHeaders = ignoreUnknownHeaders; this.ignoreUnknownHeaders = ignoreUnknownHeaders;
this.corsAllowAll = corsAllowAll; this.corsAllowAll = corsAllowAll;

4
src/main/java/org/gaul/s3proxy/S3ProxyHandlerJetty.java
Wyświetl plik

@ -20,10 +20,10 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
@ -42,7 +42,7 @@ final class S3ProxyHandlerJetty extends AbstractHandler {
S3ProxyHandlerJetty(final BlobStore blobStore, S3ProxyHandlerJetty(final BlobStore blobStore,
AuthenticationType authenticationType, final String identity, AuthenticationType authenticationType, final String identity,
final String credential, Optional<String> virtualHost, final String credential, @Nullable String virtualHost,
long v4MaxNonChunkedRequestSize, boolean ignoreUnknownHeaders, long v4MaxNonChunkedRequestSize, boolean ignoreUnknownHeaders,
boolean corsAllowAll, String servicePath) { boolean corsAllowAll, String servicePath) {
handler = new S3ProxyHandler(blobStore, authenticationType, identity, handler = new S3ProxyHandler(blobStore, authenticationType, identity,