You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/10/31 17:33:33 UTC
svn commit: r1767339 [7/14] - in /httpcomponents/httpcore/trunk: ./
httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/
httpcore5-ab/src/test/java/org/apache/hc/core5/http/benchmark/
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/boots...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/ConnectionConfig.java Mon Oct 31 17:33:27 2016
@@ -36,7 +36,7 @@ import org.apache.hc.core5.annotation.Th
import org.apache.hc.core5.util.Args;
/**
- * HTTP connection configuration.
+ * HTTP/1.1 connection configuration.
*
* @since 4.3
*/
@@ -50,22 +50,19 @@ public class ConnectionConfig {
private final Charset charset;
private final CodingErrorAction malformedInputAction;
private final CodingErrorAction unmappableInputAction;
- private final MessageConstraints messageConstraints;
ConnectionConfig(
final int bufferSize,
final int fragmentSizeHint,
final Charset charset,
final CodingErrorAction malformedInputAction,
- final CodingErrorAction unmappableInputAction,
- final MessageConstraints messageConstraints) {
+ final CodingErrorAction unmappableInputAction) {
super();
this.bufferSize = bufferSize;
this.fragmentSizeHint = fragmentSizeHint;
this.charset = charset;
this.malformedInputAction = malformedInputAction;
this.unmappableInputAction = unmappableInputAction;
- this.messageConstraints = messageConstraints;
}
public int getBufferSize() {
@@ -88,10 +85,6 @@ public class ConnectionConfig {
return unmappableInputAction;
}
- public MessageConstraints getMessageConstraints() {
- return messageConstraints;
- }
-
@Override
public String toString() {
final StringBuilder builder = new StringBuilder();
@@ -100,7 +93,6 @@ public class ConnectionConfig {
.append(", charset=").append(this.charset)
.append(", malformedInputAction=").append(this.malformedInputAction)
.append(", unmappableInputAction=").append(this.unmappableInputAction)
- .append(", messageConstraints=").append(this.messageConstraints)
.append("]");
return builder.toString();
}
@@ -116,8 +108,7 @@ public class ConnectionConfig {
.setCharset(config.getCharset())
.setFragmentSizeHint(config.getFragmentSizeHint())
.setMalformedInputAction(config.getMalformedInputAction())
- .setUnmappableInputAction(config.getUnmappableInputAction())
- .setMessageConstraints(config.getMessageConstraints());
+ .setUnmappableInputAction(config.getUnmappableInputAction());
}
public static class Builder {
@@ -127,7 +118,6 @@ public class ConnectionConfig {
private Charset charset;
private CodingErrorAction malformedInputAction;
private CodingErrorAction unmappableInputAction;
- private MessageConstraints messageConstraints;
Builder() {
this.fragmentSizeHint = -1;
@@ -164,11 +154,6 @@ public class ConnectionConfig {
return this;
}
- public Builder setMessageConstraints(final MessageConstraints messageConstraints) {
- this.messageConstraints = messageConstraints;
- return this;
- }
-
public ConnectionConfig build() {
Charset cs = charset;
if (cs == null && (malformedInputAction != null || unmappableInputAction != null)) {
@@ -181,8 +166,7 @@ public class ConnectionConfig {
fragmentHintSize,
cs,
malformedInputAction,
- unmappableInputAction,
- messageConstraints);
+ unmappableInputAction);
}
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/MessageConstraints.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java Mon Oct 31 17:33:27 2016
@@ -30,7 +30,7 @@ package org.apache.hc.core5.http.config;
import org.apache.hc.core5.util.Args;
/**
- * HTTP Message constraints: line length and header count.
+ * HTTP/1.1 protocol parameters.
* <p>
* Please note that line length is defined in bytes and not characters.
* This is only relevant however when using non-standard HTTP charsets
@@ -39,21 +39,27 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.3
*/
-public class MessageConstraints {
+public class H1Config {
- public static final MessageConstraints DEFAULT = new Builder().build();
+ public static final H1Config DEFAULT = new Builder().build();
+ private final int waitForContinueTimeout;
private final int maxLineLength;
private final int maxHeaderCount;
private final int maxEmptyLineCount;
- MessageConstraints(final int maxLineLength, final int maxHeaderCount, final int maxEmptyLineCount) {
+ H1Config(final int waitForContinueTimeout, final int maxLineLength, final int maxHeaderCount, final int maxEmptyLineCount) {
super();
+ this.waitForContinueTimeout = waitForContinueTimeout;
this.maxLineLength = maxLineLength;
this.maxHeaderCount = maxHeaderCount;
this.maxEmptyLineCount = maxEmptyLineCount;
}
+ public int getWaitForContinueTimeout() {
+ return waitForContinueTimeout;
+ }
+
public int getMaxLineLength() {
return maxLineLength;
}
@@ -72,35 +78,46 @@ public class MessageConstraints {
@Override
public String toString() {
final StringBuilder builder = new StringBuilder();
- builder.append("[maxLineLength=").append(maxLineLength)
+ builder.append("[waitForContinueTimeout=").append(waitForContinueTimeout)
+ .append(", maxLineLength=").append(maxLineLength)
.append(", maxHeaderCount=").append(maxHeaderCount)
+ .append(", maxEmptyLineCount=").append(maxEmptyLineCount)
.append("]");
return builder.toString();
}
- public static MessageConstraints.Builder custom() {
+ public static H1Config.Builder custom() {
return new Builder();
}
- public static MessageConstraints.Builder copy(final MessageConstraints config) {
+ public static H1Config.Builder copy(final H1Config config) {
Args.notNull(config, "Message constraints");
return new Builder()
- .setMaxHeaderCount(config.getMaxHeaderCount())
- .setMaxLineLength(config.getMaxLineLength());
+ .setWaitForContinueTimeout(config.getWaitForContinueTimeout())
+ .setMaxHeaderCount(config.getMaxHeaderCount())
+ .setMaxLineLength(config.getMaxLineLength())
+ .setMaxEmptyLineCount(config.maxEmptyLineCount);
}
public static class Builder {
+ private int waitForContinueTimeout;
private int maxLineLength;
private int maxHeaderCount;
private int maxEmptyLineCount;
Builder() {
+ this.waitForContinueTimeout = 3000;
this.maxLineLength = -1;
this.maxHeaderCount = -1;
this.maxEmptyLineCount = 10;
}
+ public Builder setWaitForContinueTimeout(final int waitForContinueTimeout) {
+ this.waitForContinueTimeout = waitForContinueTimeout;
+ return this;
+ }
+
public Builder setMaxLineLength(final int maxLineLength) {
this.maxLineLength = maxLineLength;
return this;
@@ -116,14 +133,10 @@ public class MessageConstraints {
return this;
}
- public MessageConstraints build() {
- return new MessageConstraints(maxLineLength, maxHeaderCount, maxEmptyLineCount);
+ public H1Config build() {
+ return new H1Config(waitForContinueTimeout, maxLineLength, maxHeaderCount, maxEmptyLineCount);
}
}
- public static MessageConstraints lineLen(final int max) {
- return custom().setMaxLineLength(Args.notNegative(max, "Max line length")).build();
- }
-
}
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/config/H1Config.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEntityDetails.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEntityDetails.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEntityDetails.java&p1=httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEntityDetails.java Mon Oct 31 17:33:27 2016
@@ -25,46 +25,41 @@
*
*/
-package org.apache.hc.core5.http2.impl;
+package org.apache.hc.core5.http.impl;
-import java.util.Collections;
import java.util.Set;
import org.apache.hc.core5.http.EntityDetails;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.MessageHeaders;
-import org.apache.hc.core5.http.message.MessageSupport;
-import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.http.io.entity.ContentType;
/**
- * HTTP/2 message entity details.
+ * Basic HTTP message entity details.
*
* @since 5.0
*/
-public class IncomingEntityDetails implements EntityDetails {
+public class BasicEntityDetails implements EntityDetails {
- private final MessageHeaders message;
+ private final long len;
+ private final ContentType contentType;
- public IncomingEntityDetails(final MessageHeaders message) {
- this.message = Args.notNull(message, "Message");
+ public BasicEntityDetails(final long len, final ContentType contentType) {
+ this.len = len;
+ this.contentType = contentType;
}
@Override
public long getContentLength() {
- return -1;
+ return len;
}
@Override
public String getContentType() {
- final Header h = message.getFirstHeader(HttpHeaders.CONTENT_TYPE);
- return h != null ? h.getValue() : null;
+ return contentType != null ? contentType.toString() : null;
}
@Override
public String getContentEncoding() {
- final Header h = message.getFirstHeader(HttpHeaders.CONTENT_TYPE);
- return h != null ? h.getValue() : null;
+ return null;
}
@Override
@@ -74,11 +69,7 @@ public class IncomingEntityDetails imple
@Override
public Set<String> getTrailerNames() {
- final Header h = message.getFirstHeader(HttpHeaders.TRAILER);
- if (h == null) {
- return Collections.emptySet();
- }
- return MessageSupport.parseTokens(h);
+ return null;
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java Mon Oct 31 17:33:27 2016
@@ -141,8 +141,7 @@ public class DefaultConnectionReuseStrat
final int status = response.getCode();
return status >= HttpStatus.SC_SUCCESS
&& status != HttpStatus.SC_NO_CONTENT
- && status != HttpStatus.SC_NOT_MODIFIED
- && status != HttpStatus.SC_RESET_CONTENT;
+ && status != HttpStatus.SC_NOT_MODIFIED;
}
}
Added: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java?rev=1767339&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java (added)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java Mon Oct 31 17:33:27 2016
@@ -0,0 +1,90 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.core5.http.impl;
+
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
+import org.apache.hc.core5.http.protocol.RequestConnControl;
+import org.apache.hc.core5.http.protocol.RequestContent;
+import org.apache.hc.core5.http.protocol.RequestExpectContinue;
+import org.apache.hc.core5.http.protocol.RequestTargetHost;
+import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
+import org.apache.hc.core5.http.protocol.ResponseConnControl;
+import org.apache.hc.core5.http.protocol.ResponseContent;
+import org.apache.hc.core5.http.protocol.ResponseDate;
+import org.apache.hc.core5.http.protocol.ResponseServer;
+import org.apache.hc.core5.util.TextUtils;
+import org.apache.hc.core5.util.VersionInfo;
+
+/**
+ * @since 5.0
+ */
+public final class HttpProcessors {
+
+ private final static String SOFTWARE = "Apache-HttpCore";
+
+ public static HttpProcessorBuilder customServer(final String serverInfo) {
+ return HttpProcessorBuilder.create()
+ .addAll(
+ new ResponseDate(),
+ new ResponseServer(!TextUtils.isBlank(serverInfo) ? serverInfo :
+ VersionInfo.getSoftwareInfo(SOFTWARE, "org.apache.hc.core5", HttpProcessors.class)),
+ new ResponseContent(),
+ new ResponseConnControl())
+ .addAll(
+ new RequestValidateHost());
+ }
+
+ public static HttpProcessor server(final String serverInfo) {
+ return customServer(serverInfo).build();
+ }
+
+ public static HttpProcessor server() {
+ return customServer(null).build();
+ }
+
+ public static HttpProcessorBuilder customClient(final String agentInfo) {
+ return HttpProcessorBuilder.create()
+ .addAll(
+ new RequestContent(),
+ new RequestTargetHost(),
+ new RequestConnControl(),
+ new RequestUserAgent(!TextUtils.isBlank(agentInfo) ? agentInfo :
+ VersionInfo.getSoftwareInfo(SOFTWARE, "org.apache.hc.core5", HttpProcessors.class)),
+ new RequestExpectContinue());
+ };
+
+ public static HttpProcessor client(final String agentInfo) {
+ return customClient(agentInfo).build();
+ }
+
+ public static HttpProcessor client() {
+ return customClient(null).build();
+ }
+
+}
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/IncomingHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/IncomingHttpEntity.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/IncomingHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/IncomingHttpEntity.java Mon Oct 31 17:33:27 2016
@@ -34,7 +34,7 @@ import java.util.Set;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.TrailerSupplier;
-import org.apache.hc.core5.http.entity.AbstractImmutableHttpEntity;
+import org.apache.hc.core5.http.io.entity.AbstractImmutableHttpEntity;
import org.apache.hc.core5.http.impl.io.EmptyInputStream;
/**
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java&p1=httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/IncomingEntityDetails.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java Mon Oct 31 17:33:27 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http2.impl;
+package org.apache.hc.core5.http.impl;
import java.util.Collections;
import java.util.Set;
@@ -38,15 +38,15 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.util.Args;
/**
- * HTTP/2 message entity details.
+ * HTTP message entity details.
*
* @since 5.0
*/
-public class IncomingEntityDetails implements EntityDetails {
+public class LazyEntityDetails implements EntityDetails {
private final MessageHeaders message;
- public IncomingEntityDetails(final MessageHeaders message) {
+ public LazyEntityDetails(final MessageHeaders message) {
this.message = Args.notNull(message, "Message");
}
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/LazyEntityDetails.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageParser.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageParser.java Mon Oct 31 17:33:27 2016
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpMessage;
import org.apache.hc.core5.http.MessageConstraintException;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.io.HttpMessageParser;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.apache.hc.core5.http.message.LazyLineParser;
@@ -55,7 +55,7 @@ public abstract class AbstractMessagePar
private static final int HEAD_LINE = 0;
private static final int HEADERS = 1;
- private final MessageConstraints messageConstraints;
+ private final H1Config messageConstraints;
private final List<CharArrayBuffer> headerLines;
private final CharArrayBuffer headLine;
private final LineParser lineParser;
@@ -69,14 +69,14 @@ public abstract class AbstractMessagePar
* @param lineParser the line parser. If {@code null}
* {@link org.apache.hc.core5.http.message.LazyLineParser#INSTANCE} will be used.
* @param constraints the message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
*
* @since 4.3
*/
- public AbstractMessageParser(final LineParser lineParser, final MessageConstraints constraints) {
+ public AbstractMessageParser(final LineParser lineParser, final H1Config constraints) {
super();
this.lineParser = lineParser != null ? lineParser : LazyLineParser.INSTANCE;
- this.messageConstraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
+ this.messageConstraints = constraints != null ? constraints : H1Config.DEFAULT;
this.headerLines = new ArrayList<>();
this.headLine = new CharArrayBuffer(128);
this.state = HEAD_LINE;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java Mon Oct 31 17:33:27 2016
@@ -46,7 +46,7 @@ import org.apache.hc.core5.http.HttpHead
import org.apache.hc.core5.http.HttpMessage;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.TrailerSupplier;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics;
import org.apache.hc.core5.http.impl.BasicHttpConnectionMetrics;
import org.apache.hc.core5.http.impl.IncomingHttpEntity;
@@ -60,7 +60,7 @@ class BHttpConnectionBase implements BHt
final SessionInputBufferImpl inbuffer;
final SessionOutputBufferImpl outbuffer;
- final MessageConstraints messageConstraints;
+ final H1Config messageConstraints;
final BasicHttpConnectionMetrics connMetrics;
final AtomicReference<SocketHolder> socketHolderRef;
@@ -71,13 +71,13 @@ class BHttpConnectionBase implements BHt
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints messageConstraints) {
+ final H1Config messageConstraints) {
super();
Args.positive(buffersize, "Buffer size");
final BasicHttpTransportMetrics inTransportMetrics = new BasicHttpTransportMetrics();
final BasicHttpTransportMetrics outTransportMetrics = new BasicHttpTransportMetrics();
this.inbuffer = new SessionInputBufferImpl(inTransportMetrics, buffersize, -1,
- messageConstraints != null ? messageConstraints : MessageConstraints.DEFAULT, chardecoder);
+ messageConstraints != null ? messageConstraints : H1Config.DEFAULT, chardecoder);
this.outbuffer = new SessionOutputBufferImpl(outTransportMetrics, buffersize, fragmentSizeHint,
charencoder);
this.messageConstraints = messageConstraints;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedInputStream.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedInputStream.java Mon Oct 31 17:33:27 2016
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HttpExce
import org.apache.hc.core5.http.MalformedChunkCodingException;
import org.apache.hc.core5.http.StreamClosedException;
import org.apache.hc.core5.http.TruncatedChunkException;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.CharArrayBuffer;
@@ -70,7 +70,7 @@ public class ChunkedInputStream extends
private final SessionInputBuffer buffer;
private final InputStream inputStream;
private final CharArrayBuffer lineBuffer;
- private final MessageConstraints constraints;
+ private final H1Config constraints;
private int state;
@@ -93,17 +93,17 @@ public class ChunkedInputStream extends
*
* @param buffer Session input buffer
* @param inputStream Input stream
- * @param constraints Message constraints. If {@code null} {@link MessageConstraints#DEFAULT} will be used.
+ * @param constraints Message constraints. If {@code null} {@link H1Config#DEFAULT} will be used.
*
* @since 4.4
*/
- public ChunkedInputStream(final SessionInputBuffer buffer, final InputStream inputStream, final MessageConstraints constraints) {
+ public ChunkedInputStream(final SessionInputBuffer buffer, final InputStream inputStream, final H1Config constraints) {
super();
this.buffer = Args.notNull(buffer, "Session input buffer");
this.inputStream = Args.notNull(inputStream, "Input stream");
this.pos = 0L;
this.lineBuffer = new CharArrayBuffer(16);
- this.constraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
+ this.constraints = constraints != null ? constraints : H1Config.DEFAULT;
this.state = CHUNK_LEN;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnection.java Mon Oct 31 17:33:27 2016
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.HttpEnti
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.LengthRequiredException;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.io.HttpMessageParser;
@@ -73,7 +73,7 @@ public class DefaultBHttpClientConnectio
* @param charencoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param constraints Message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
* @param incomingContentStrategy incoming content length strategy. If {@code null}
* {@link DefaultContentLengthStrategy#INSTANCE} will be used.
* @param outgoingContentStrategy outgoing content length strategy. If {@code null}
@@ -88,7 +88,7 @@ public class DefaultBHttpClientConnectio
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints constraints,
+ final H1Config constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageWriterFactory<ClassicHttpRequest> requestWriterFactory,
@@ -109,7 +109,7 @@ public class DefaultBHttpClientConnectio
final int buffersize,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints constraints) {
+ final H1Config constraints) {
this(buffersize, buffersize, chardecoder, charencoder, constraints, null, null, null, null);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpClientConnectionFactory.java Mon Oct 31 17:33:27 2016
@@ -36,6 +36,7 @@ import org.apache.hc.core5.http.ClassicH
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.ConnSupport;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
@@ -94,7 +95,7 @@ public class DefaultBHttpClientConnectio
this.cconfig.getFragmentSizeHint(),
ConnSupport.createDecoder(this.cconfig),
ConnSupport.createEncoder(this.cconfig),
- this.cconfig.getMessageConstraints(),
+ H1Config.DEFAULT,
this.incomingContentStrategy,
this.outgoingContentStrategy,
this.requestWriterFactory,
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnection.java Mon Oct 31 17:33:27 2016
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.ContentL
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
import org.apache.hc.core5.http.io.HttpMessageParser;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
@@ -70,7 +70,7 @@ public class DefaultBHttpServerConnectio
* @param charencoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param constraints Message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
* @param incomingContentStrategy incoming content length strategy. If {@code null}
* {@link DefaultContentLengthStrategy#INSTANCE} will be used.
* @param outgoingContentStrategy outgoing content length strategy. If {@code null}
@@ -85,7 +85,7 @@ public class DefaultBHttpServerConnectio
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints constraints,
+ final H1Config constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
@@ -105,7 +105,7 @@ public class DefaultBHttpServerConnectio
final int buffersize,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
- final MessageConstraints constraints) {
+ final H1Config constraints) {
this(buffersize, buffersize, chardecoder, charencoder, constraints, null, null, null, null);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultBHttpServerConnectionFactory.java Mon Oct 31 17:33:27 2016
@@ -36,6 +36,7 @@ import org.apache.hc.core5.http.ClassicH
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.config.ConnectionConfig;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.ConnSupport;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
@@ -94,7 +95,7 @@ public class DefaultBHttpServerConnectio
this.cconfig.getFragmentSizeHint(),
ConnSupport.createDecoder(this.cconfig),
ConnSupport.createEncoder(this.cconfig),
- this.cconfig.getMessageConstraints(),
+ H1Config.DEFAULT,
this.incomingContentStrategy,
this.outgoingContentStrategy,
this.requestParserFactory,
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpRequestFactory.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpRequestFactory.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpRequestFactory.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpRequestFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpRequestFactory.java Mon Oct 31 17:33:27 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -41,9 +41,9 @@ import org.apache.hc.core5.http.message.
* @since 4.0
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DefaultHttpRequestFactory implements HttpRequestFactory<ClassicHttpRequest> {
+public class DefaultClassicHttpRequestFactory implements HttpRequestFactory<ClassicHttpRequest> {
- public static final DefaultHttpRequestFactory INSTANCE = new DefaultHttpRequestFactory();
+ public static final DefaultClassicHttpRequestFactory INSTANCE = new DefaultClassicHttpRequestFactory();
private static final String[] SUPPORTED_METHODS = {
"GET",
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpResponseFactory.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpResponseFactory.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpResponseFactory.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultHttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultClassicHttpResponseFactory.java Mon Oct 31 17:33:27 2016
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import org.apache.hc.core5.annotation.Contract;
import org.apache.hc.core5.annotation.ThreadingBehavior;
@@ -33,6 +33,7 @@ import org.apache.hc.core5.http.ClassicH
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.ReasonPhraseCatalog;
+import org.apache.hc.core5.http.impl.EnglishReasonPhraseCatalog;
import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.util.Args;
@@ -42,9 +43,9 @@ import org.apache.hc.core5.util.Args;
* @since 4.0
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-public class DefaultHttpResponseFactory implements HttpResponseFactory<ClassicHttpResponse> {
+public class DefaultClassicHttpResponseFactory implements HttpResponseFactory<ClassicHttpResponse> {
- public static final DefaultHttpResponseFactory INSTANCE = new DefaultHttpResponseFactory();
+ public static final DefaultClassicHttpResponseFactory INSTANCE = new DefaultClassicHttpResponseFactory();
private final ReasonPhraseCatalog reasonCatalog;
@@ -53,7 +54,7 @@ public class DefaultHttpResponseFactory
*
* @param catalog the catalog of reason phrases
*/
- public DefaultHttpResponseFactory(final ReasonPhraseCatalog catalog) {
+ public DefaultClassicHttpResponseFactory(final ReasonPhraseCatalog catalog) {
this.reasonCatalog = Args.notNull(catalog, "Reason phrase catalog");
}
@@ -61,7 +62,7 @@ public class DefaultHttpResponseFactory
* Creates a new response factory with the default catalog.
* The default catalog is {@link EnglishReasonPhraseCatalog}.
*/
- public DefaultHttpResponseFactory() {
+ public DefaultClassicHttpResponseFactory() {
this(EnglishReasonPhraseCatalog.INSTANCE);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParser.java Mon Oct 31 17:33:27 2016
@@ -36,8 +36,7 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
-import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.message.LineParser;
import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.util.CharArrayBuffer;
@@ -58,24 +57,24 @@ public class DefaultHttpRequestParser ex
* @param lineParser the line parser. If {@code null}
* {@link org.apache.hc.core5.http.message.LazyLineParser#INSTANCE} will be used.
* @param requestFactory the response factory. If {@code null}
- * {@link DefaultHttpRequestFactory#INSTANCE} will be used.
+ * {@link DefaultClassicHttpRequestFactory#INSTANCE} will be used.
* @param constraints the message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
*
* @since 4.3
*/
public DefaultHttpRequestParser(
final LineParser lineParser,
final HttpRequestFactory<ClassicHttpRequest> requestFactory,
- final MessageConstraints constraints) {
+ final H1Config constraints) {
super(lineParser, constraints);
- this.requestFactory = requestFactory != null ? requestFactory : DefaultHttpRequestFactory.INSTANCE;
+ this.requestFactory = requestFactory != null ? requestFactory : DefaultClassicHttpRequestFactory.INSTANCE;
}
/**
* @since 4.3
*/
- public DefaultHttpRequestParser(final MessageConstraints constraints) {
+ public DefaultHttpRequestParser(final H1Config constraints) {
this(null, null, constraints);
}
@@ -83,7 +82,7 @@ public class DefaultHttpRequestParser ex
* @since 4.3
*/
public DefaultHttpRequestParser() {
- this(MessageConstraints.DEFAULT);
+ this(H1Config.DEFAULT);
}
@Override
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestParserFactory.java Mon Oct 31 17:33:27 2016
@@ -31,8 +31,7 @@ import org.apache.hc.core5.annotation.Co
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpRequestFactory;
-import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.DefaultHttpRequestFactory;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.io.HttpMessageParser;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.message.LazyLineParser;
@@ -55,7 +54,7 @@ public class DefaultHttpRequestParserFac
final HttpRequestFactory requestFactory) {
super();
this.lineParser = lineParser != null ? lineParser : LazyLineParser.INSTANCE;
- this.requestFactory = requestFactory != null ? requestFactory : DefaultHttpRequestFactory.INSTANCE;
+ this.requestFactory = requestFactory != null ? requestFactory : DefaultClassicHttpRequestFactory.INSTANCE;
}
public DefaultHttpRequestParserFactory() {
@@ -63,7 +62,7 @@ public class DefaultHttpRequestParserFac
}
@Override
- public HttpMessageParser<ClassicHttpRequest> create(final MessageConstraints constraints) {
+ public HttpMessageParser<ClassicHttpRequest> create(final H1Config constraints) {
return new DefaultHttpRequestParser(this.lineParser, this.requestFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParser.java Mon Oct 31 17:33:27 2016
@@ -36,8 +36,7 @@ import org.apache.hc.core5.http.HttpVers
import org.apache.hc.core5.http.NoHttpResponseException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
-import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.message.LineParser;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.util.CharArrayBuffer;
@@ -58,24 +57,24 @@ public class DefaultHttpResponseParser e
* @param lineParser the line parser. If {@code null}
* {@link org.apache.hc.core5.http.message.LazyLineParser#INSTANCE} will be used
* @param responseFactory the response factory. If {@code null}
- * {@link DefaultHttpResponseFactory#INSTANCE} will be used.
+ * {@link DefaultClassicHttpResponseFactory#INSTANCE} will be used.
* @param constraints the message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
*
* @since 4.3
*/
public DefaultHttpResponseParser(
final LineParser lineParser,
final HttpResponseFactory<ClassicHttpResponse> responseFactory,
- final MessageConstraints constraints) {
+ final H1Config constraints) {
super(lineParser, constraints);
- this.responseFactory = responseFactory != null ? responseFactory : DefaultHttpResponseFactory.INSTANCE;
+ this.responseFactory = responseFactory != null ? responseFactory : DefaultClassicHttpResponseFactory.INSTANCE;
}
/**
* @since 4.3
*/
- public DefaultHttpResponseParser(final MessageConstraints constraints) {
+ public DefaultHttpResponseParser(final H1Config constraints) {
this(null, null, constraints);
}
@@ -83,7 +82,7 @@ public class DefaultHttpResponseParser e
* @since 4.3
*/
public DefaultHttpResponseParser() {
- this(MessageConstraints.DEFAULT);
+ this(H1Config.DEFAULT);
}
@Override
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseParserFactory.java Mon Oct 31 17:33:27 2016
@@ -31,8 +31,7 @@ import org.apache.hc.core5.annotation.Co
import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
-import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.io.HttpMessageParser;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.message.LazyLaxLineParser;
@@ -55,7 +54,7 @@ public class DefaultHttpResponseParserFa
final HttpResponseFactory responseFactory) {
super();
this.lineParser = lineParser != null ? lineParser : LazyLaxLineParser.INSTANCE;
- this.responseFactory = responseFactory != null ? responseFactory : DefaultHttpResponseFactory.INSTANCE;
+ this.responseFactory = responseFactory != null ? responseFactory : DefaultClassicHttpResponseFactory.INSTANCE;
}
public DefaultHttpResponseParserFactory() {
@@ -63,7 +62,7 @@ public class DefaultHttpResponseParserFa
}
@Override
- public HttpMessageParser<ClassicHttpResponse> create(final MessageConstraints constraints) {
+ public HttpMessageParser<ClassicHttpResponse> create(final H1Config constraints) {
return new DefaultHttpResponseParser(this.lineParser, this.responseFactory, constraints);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java Mon Oct 31 17:33:27 2016
@@ -100,8 +100,7 @@ public class HttpRequestExecutor {
final int status = response.getCode();
return status >= HttpStatus.SC_SUCCESS
&& status != HttpStatus.SC_NO_CONTENT
- && status != HttpStatus.SC_NOT_MODIFIED
- && status != HttpStatus.SC_RESET_CONTENT;
+ && status != HttpStatus.SC_NOT_MODIFIED;
}
/**
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java Mon Oct 31 17:33:27 2016
@@ -45,17 +45,16 @@ import org.apache.hc.core5.http.NotImple
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
-import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.io.HttpExpectationVerifier;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
import org.apache.hc.core5.http.io.HttpServerConnection;
+import org.apache.hc.core5.http.io.entity.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.io.HttpExpectationVerifier;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
@@ -94,7 +93,7 @@ public class HttpService {
* @param connStrategy the connection reuse strategy. If {@code null}
* {@link DefaultConnectionReuseStrategy#INSTANCE} will be used.
* @param responseFactory the response factory. If {@code null}
- * {@link DefaultHttpResponseFactory#INSTANCE} will be used.
+ * {@link DefaultClassicHttpResponseFactory#INSTANCE} will be used.
* @param handlerMapper the handler mapper. May be null.
* @param expectationVerifier the expectation verifier. May be null.
*
@@ -111,7 +110,7 @@ public class HttpService {
this.connStrategy = connStrategy != null ? connStrategy :
DefaultConnectionReuseStrategy.INSTANCE;
this.responseFactory = responseFactory != null ? responseFactory :
- DefaultHttpResponseFactory.INSTANCE;
+ DefaultClassicHttpResponseFactory.INSTANCE;
this.handlerMapper = handlerMapper;
this.expectationVerifier = expectationVerifier;
}
@@ -123,7 +122,7 @@ public class HttpService {
* @param connStrategy the connection reuse strategy. If {@code null}
* {@link DefaultConnectionReuseStrategy#INSTANCE} will be used.
* @param responseFactory the response factory. If {@code null}
- * {@link DefaultHttpResponseFactory#INSTANCE} will be used.
+ * {@link DefaultClassicHttpResponseFactory#INSTANCE} will be used.
* @param handlerMapper the handler mapper. May be null.
*
* @since 4.3
@@ -245,8 +244,7 @@ public class HttpService {
final int status = response.getCode();
return status >= HttpStatus.SC_SUCCESS
&& status != HttpStatus.SC_NO_CONTENT
- && status != HttpStatus.SC_NOT_MODIFIED
- && status != HttpStatus.SC_RESET_CONTENT;
+ && status != HttpStatus.SC_NOT_MODIFIED;
}
/**
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java?rev=1767339&r1=1767338&r2=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java Mon Oct 31 17:33:27 2016
@@ -36,7 +36,7 @@ import java.nio.charset.CoderResult;
import org.apache.hc.core5.http.Chars;
import org.apache.hc.core5.http.MessageConstraintException;
-import org.apache.hc.core5.http.config.MessageConstraints;
+import org.apache.hc.core5.http.config.H1Config;
import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics;
import org.apache.hc.core5.http.io.HttpTransportMetrics;
import org.apache.hc.core5.http.io.SessionInputBuffer;
@@ -61,7 +61,7 @@ public class SessionInputBufferImpl impl
private final byte[] buffer;
private final ByteArrayBuffer linebuffer;
private final int minChunkLimit;
- private final MessageConstraints constraints;
+ private final H1Config constraints;
private final CharsetDecoder decoder;
private int bufferpos;
@@ -79,7 +79,7 @@ public class SessionInputBufferImpl impl
* between performance of memory copy operations and that of native method invocation.
* If negative default chunk limited will be used.
* @param constraints Message constraints. If {@code null}
- * {@link MessageConstraints#DEFAULT} will be used.
+ * {@link H1Config#DEFAULT} will be used.
* @param chardecoder chardecoder to be used for decoding HTTP protocol elements.
* If {@code null} simple type cast will be used for byte to char conversion.
*/
@@ -87,7 +87,7 @@ public class SessionInputBufferImpl impl
final BasicHttpTransportMetrics metrics,
final int buffersize,
final int minChunkLimit,
- final MessageConstraints constraints,
+ final H1Config constraints,
final CharsetDecoder chardecoder) {
Args.notNull(metrics, "HTTP transport metrcis");
Args.positive(buffersize, "Buffer size");
@@ -96,7 +96,7 @@ public class SessionInputBufferImpl impl
this.bufferpos = 0;
this.bufferlen = 0;
this.minChunkLimit = minChunkLimit >= 0 ? minChunkLimit : 512;
- this.constraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
+ this.constraints = constraints != null ? constraints : H1Config.DEFAULT;
this.linebuffer = new ByteArrayBuffer(buffersize);
this.decoder = chardecoder;
}
@@ -107,7 +107,7 @@ public class SessionInputBufferImpl impl
this(metrics, buffersize, buffersize, null, null);
}
- public SessionInputBufferImpl(final int buffersize, final MessageConstraints constraints) {
+ public SessionInputBufferImpl(final int buffersize, final H1Config constraints) {
this(new BasicHttpTransportMetrics(), buffersize, buffersize, constraints, null);
}
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.io.IOException;
import java.net.InetAddress;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/HttpServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/RequestListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.io.IOException;
import java.net.ServerSocket;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/RequestListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/SSLServerSetupHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocket;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/SSLServerSetupHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/ServerBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java Mon Oct 31 17:33:27 2016
@@ -24,40 +24,33 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.net.InetAddress;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.Map;
import javax.net.ServerSocketFactory;
import javax.net.ssl.SSLContext;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ConnectionReuseStrategy;
import org.apache.hc.core5.http.ExceptionListener;
-import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.HttpResponseFactory;
-import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.impl.HttpProcessors;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.config.SocketConfig;
import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnectionFactory;
+import org.apache.hc.core5.http.impl.io.DefaultClassicHttpResponseFactory;
import org.apache.hc.core5.http.impl.io.HttpService;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
+import org.apache.hc.core5.http.io.HttpExpectationVerifier;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
import org.apache.hc.core5.http.io.UriHttpRequestHandlerMapper;
-import org.apache.hc.core5.http.io.HttpExpectationVerifier;
import org.apache.hc.core5.http.protocol.HttpProcessor;
-import org.apache.hc.core5.http.protocol.HttpProcessorBuilder;
-import org.apache.hc.core5.http.protocol.RequestValidateHost;
-import org.apache.hc.core5.http.protocol.ResponseConnControl;
-import org.apache.hc.core5.http.protocol.ResponseContent;
-import org.apache.hc.core5.http.protocol.ResponseDate;
-import org.apache.hc.core5.http.protocol.ResponseServer;
/**
* @since 4.4
@@ -68,14 +61,9 @@ public class ServerBootstrap {
private InetAddress localAddress;
private SocketConfig socketConfig;
private ConnectionConfig connectionConfig;
- private LinkedList<HttpRequestInterceptor> requestFirst;
- private LinkedList<HttpRequestInterceptor> requestLast;
- private LinkedList<HttpResponseInterceptor> responseFirst;
- private LinkedList<HttpResponseInterceptor> responseLast;
- private String serverInfo;
private HttpProcessor httpProcessor;
private ConnectionReuseStrategy connStrategy;
- private HttpResponseFactory responseFactory;
+ private HttpResponseFactory<ClassicHttpResponse> responseFactory;
private HttpRequestHandlerMapper handlerMapper;
private Map<String, HttpRequestHandler> handlerMap;
private HttpExpectationVerifier expectationVerifier;
@@ -136,85 +124,6 @@ public class ServerBootstrap {
}
/**
- * Adds this protocol interceptor to the head of the protocol processing list.
- * <p>
- * Please note this value can be overridden by the {@link #setHttpProcessor(
- * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
- */
- public final ServerBootstrap addInterceptorFirst(final HttpResponseInterceptor itcp) {
- if (itcp == null) {
- return this;
- }
- if (responseFirst == null) {
- responseFirst = new LinkedList<>();
- }
- responseFirst.addFirst(itcp);
- return this;
- }
-
- /**
- * Adds this protocol interceptor to the tail of the protocol processing list.
- * <p>
- * Please note this value can be overridden by the {@link #setHttpProcessor(
- * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
- */
- public final ServerBootstrap addInterceptorLast(final HttpResponseInterceptor itcp) {
- if (itcp == null) {
- return this;
- }
- if (responseLast == null) {
- responseLast = new LinkedList<>();
- }
- responseLast.addLast(itcp);
- return this;
- }
-
- /**
- * Adds this protocol interceptor to the head of the protocol processing list.
- * <p>
- * Please note this value can be overridden by the {@link #setHttpProcessor(
- * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
- */
- public final ServerBootstrap addInterceptorFirst(final HttpRequestInterceptor itcp) {
- if (itcp == null) {
- return this;
- }
- if (requestFirst == null) {
- requestFirst = new LinkedList<>();
- }
- requestFirst.addFirst(itcp);
- return this;
- }
-
- /**
- * Adds this protocol interceptor to the tail of the protocol processing list.
- * <p>
- * Please note this value can be overridden by the {@link #setHttpProcessor(
- * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
- */
- public final ServerBootstrap addInterceptorLast(final HttpRequestInterceptor itcp) {
- if (itcp == null) {
- return this;
- }
- if (requestLast == null) {
- requestLast = new LinkedList<>();
- }
- requestLast.addLast(itcp);
- return this;
- }
-
- /**
- * Assigns {@code Server} response header value.
- * <p>
- * Please note this value can be overridden by the {@link #setHttpProcessor(
- * org.apache.hc.core5.http.protocol.HttpProcessor)} method.
- */
- public final ServerBootstrap setServerInfo(final String serverInfo) {
- this.serverInfo = serverInfo;
- return this;
- }
-
- /**
* Assigns {@link ConnectionReuseStrategy} instance.
*/
public final ServerBootstrap setConnectionReuseStrategy(final ConnectionReuseStrategy connStrategy) {
@@ -225,7 +134,7 @@ public class ServerBootstrap {
/**
* Assigns {@link HttpResponseFactory} instance.
*/
- public final ServerBootstrap setResponseFactory(final HttpResponseFactory responseFactory) {
+ public final ServerBootstrap setResponseFactory(final HttpResponseFactory<ClassicHttpResponse> responseFactory) {
this.responseFactory = responseFactory;
return this;
}
@@ -315,42 +224,7 @@ public class ServerBootstrap {
HttpProcessor httpProcessorCopy = this.httpProcessor;
if (httpProcessorCopy == null) {
-
- final HttpProcessorBuilder b = HttpProcessorBuilder.create();
- if (requestFirst != null) {
- for (final HttpRequestInterceptor i: requestFirst) {
- b.addFirst(i);
- }
- }
- if (responseFirst != null) {
- for (final HttpResponseInterceptor i: responseFirst) {
- b.addFirst(i);
- }
- }
-
- String serverInfoCopy = this.serverInfo;
- if (serverInfoCopy == null) {
- serverInfoCopy = "Apache-HttpCore/1.1";
- }
-
- b.addAll(
- new ResponseDate(),
- new ResponseServer(serverInfoCopy),
- new ResponseContent(),
- new ResponseConnControl());
- b.addAll(
- new RequestValidateHost());
- if (requestLast != null) {
- for (final HttpRequestInterceptor i: requestLast) {
- b.addLast(i);
- }
- }
- if (responseLast != null) {
- for (final HttpResponseInterceptor i: responseLast) {
- b.addLast(i);
- }
- }
- httpProcessorCopy = b.build();
+ httpProcessorCopy = HttpProcessors.server();
}
HttpRequestHandlerMapper handlerMapperCopy = this.handlerMapper;
@@ -369,9 +243,9 @@ public class ServerBootstrap {
connStrategyCopy = DefaultConnectionReuseStrategy.INSTANCE;
}
- HttpResponseFactory responseFactoryCopy = this.responseFactory;
+ HttpResponseFactory<ClassicHttpResponse> responseFactoryCopy = this.responseFactory;
if (responseFactoryCopy == null) {
- responseFactoryCopy = DefaultHttpResponseFactory.INSTANCE;
+ responseFactoryCopy = DefaultClassicHttpResponseFactory.INSTANCE;
}
final HttpService httpService = new HttpService(
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ServerBootstrap.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/nio/ThreadFactoryImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.nio;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/ThreadFactoryImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/Worker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.io.IOException;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/Worker.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/WorkerPoolExecutor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/WorkerPoolExecutor.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/WorkerPoolExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
import java.util.HashSet;
import java.util.Map;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/WorkerPoolExecutor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/bootstrap/io/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java Mon Oct 31 17:33:27 2016
@@ -28,4 +28,4 @@
/**
* Embedded server and server bootstrap.
*/
-package org.apache.hc.core5.http.bootstrap.io;
+package org.apache.hc.core5.http.impl.io.bootstrap;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/bootstrap/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnFactory.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.pool.io;
+package org.apache.hc.core5.http.impl.io.pool;
import java.io.IOException;
import java.net.InetSocketAddress;
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnPool.java (from r1765384, httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnPool.java&r1=1765384&r2=1767339&rev=1767339&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/pool/io/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/pool/BasicConnPool.java Mon Oct 31 17:33:27 2016
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.pool.io;
+package org.apache.hc.core5.http.impl.io.pool;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicLong;