Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2EFF8200AC8 for ; Tue, 7 Jun 2016 20:27:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2D651160968; Tue, 7 Jun 2016 18:27:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DDD77160A36 for ; Tue, 7 Jun 2016 20:27:09 +0200 (CEST) Received: (qmail 65685 invoked by uid 500); 7 Jun 2016 18:27:04 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 65668 invoked by uid 99); 7 Jun 2016 18:27:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2016 18:27:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8D041C0D08 for ; Tue, 7 Jun 2016 18:27:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id lHcEJB6WNK8V for ; Tue, 7 Jun 2016 18:26:49 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id E3A385FAD2 for ; Tue, 7 Jun 2016 18:26:48 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 0ADE9E031A for ; Tue, 7 Jun 2016 18:26:48 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 08BB83A06E1 for ; Tue, 7 Jun 2016 18:26:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1747291 [2/4] - in /httpcomponents/httpcore/trunk: ./ httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/ httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/ httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/ http... Date: Tue, 07 Jun 2016 18:26:46 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160607182648.08BB83A06E1@svn01-us-west.apache.org> archived-at: Tue, 07 Jun 2016 18:27:12 -0000 Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/StringEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/StringEntity.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/StringEntity.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/entity/StringEntity.java Tue Jun 7 18:26:44 2016 @@ -34,7 +34,6 @@ import java.io.OutputStream; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.util.Args; /** @@ -43,8 +42,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe -public class StringEntity extends AbstractHttpEntity { +public class StringEntity extends AbstractHttpEntity implements Cloneable { private final byte[] content; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicHttpTransportMetrics.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicHttpTransportMetrics.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicHttpTransportMetrics.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicHttpTransportMetrics.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,6 @@ package org.apache.hc.core5.http.impl; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.io.HttpTransportMetrics; /** @@ -35,7 +34,6 @@ import org.apache.hc.core5.http.io.HttpT * * @since 4.0 */ -@NotThreadSafe public class BasicHttpTransportMetrics implements HttpTransportMetrics { private long bytesTransferred = 0; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -29,7 +29,8 @@ package org.apache.hc.core5.http.impl; import java.util.Iterator; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HeaderElements; @@ -64,7 +65,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultConnectionReuseStrategy implements ConnectionReuseStrategy { public static final DefaultConnectionReuseStrategy INSTANCE = new DefaultConnectionReuseStrategy(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultContentLengthStrategy.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HeaderElements; @@ -48,7 +49,7 @@ import org.apache.hc.core5.util.Args; * * @since 5.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultContentLengthStrategy implements ContentLengthStrategy { public static final DefaultContentLengthStrategy INSTANCE = new DefaultContentLengthStrategy(); Modified: 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/DefaultHttpRequestFactory.java?rev=1747291&r1=1747290&r2=1747291&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/DefaultHttpRequestFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestFactory; import org.apache.hc.core5.http.MethodNotSupportedException; @@ -39,7 +40,7 @@ import org.apache.hc.core5.http.message. * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultHttpRequestFactory implements HttpRequestFactory { public static final DefaultHttpRequestFactory INSTANCE = new DefaultHttpRequestFactory(); Modified: 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/DefaultHttpResponseFactory.java?rev=1747291&r1=1747290&r2=1747291&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/DefaultHttpResponseFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponseFactory; import org.apache.hc.core5.http.ProtocolVersion; @@ -40,7 +41,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpResponseFactory implements HttpResponseFactory { public static final DefaultHttpResponseFactory INSTANCE = new DefaultHttpResponseFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/EnglishReasonPhraseCatalog.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/EnglishReasonPhraseCatalog.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/EnglishReasonPhraseCatalog.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/EnglishReasonPhraseCatalog.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,8 @@ package org.apache.hc.core5.http.impl; import java.util.Locale; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.ReasonPhraseCatalog; import org.apache.hc.core5.util.Args; @@ -41,7 +42,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class EnglishReasonPhraseCatalog implements ReasonPhraseCatalog { // static array with english reason phrases defined below @@ -51,8 +52,7 @@ public class EnglishReasonPhraseCatalog * This catalog is thread safe, so there typically * is no need to create other instances. */ - public final static EnglishReasonPhraseCatalog INSTANCE = - new EnglishReasonPhraseCatalog(); + public final static EnglishReasonPhraseCatalog INSTANCE = new EnglishReasonPhraseCatalog(); /** Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpConnectionMetricsImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpConnectionMetricsImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpConnectionMetricsImpl.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpConnectionMetricsImpl.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl; import java.util.HashMap; import java.util.Map; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpConnectionMetrics; import org.apache.hc.core5.http.io.HttpTransportMetrics; @@ -39,7 +38,6 @@ import org.apache.hc.core5.http.io.HttpT * * @since 4.0 */ -@NotThreadSafe public class HttpConnectionMetricsImpl implements HttpConnectionMetrics { public static final String REQUEST_COUNT = "http.request-count"; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.io.InputStream; import java.util.Collections; import java.util.Set; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.TrailerSupplier; import org.apache.hc.core5.http.entity.AbstractImmutableHttpEntity; @@ -43,7 +42,6 @@ import org.apache.hc.core5.http.impl.io. * * @since 5.0 */ -@NotThreadSafe public class IncomingHttpEntity extends AbstractImmutableHttpEntity { private final InputStream content; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpMessage; @@ -51,7 +50,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractMessageParser implements HttpMessageParser { private static final int HEAD_LINE = 0; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/AbstractMessageWriter.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.FormattedHeader; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; @@ -49,7 +48,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractMessageWriter implements HttpMessageWriter { private final CharArrayBuffer lineBuf; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.InputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; @@ -58,7 +57,6 @@ import org.apache.hc.core5.util.CharArra * @since 4.0 * */ -@NotThreadSafe public class ChunkedInputStream extends InputStream { private static final int CHUNK_LEN = 1; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedOutputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedOutputStream.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedOutputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ChunkedOutputStream.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.OutputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.FormattedHeader; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.StreamClosedException; @@ -52,7 +51,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public class ChunkedOutputStream extends OutputStream { private final SessionOutputBuffer buffer; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthInputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthInputStream.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthInputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthInputStream.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.InputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.StreamClosedException; import org.apache.hc.core5.http.io.SessionInputBuffer; @@ -52,7 +51,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class ContentLengthInputStream extends InputStream { private static final int BUFFER_SIZE = 2048; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/ContentLengthOutputStream.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.OutputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.StreamClosedException; import org.apache.hc.core5.http.io.SessionOutputBuffer; import org.apache.hc.core5.util.Args; @@ -48,7 +47,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class ContentLengthOutputStream extends OutputStream { private final SessionOutputBuffer buffer; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -33,7 +33,6 @@ import java.net.Socket; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; @@ -55,7 +54,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.3 */ -@NotThreadSafe public class DefaultBHttpClientConnection extends BHttpConnectionBase implements HttpClientConnection { 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -30,7 +30,8 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.net.Socket; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -45,7 +46,7 @@ import org.apache.hc.core5.http.io.HttpM * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultBHttpClientConnectionFactory implements HttpConnectionFactory { 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -33,7 +33,6 @@ import java.net.Socket; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; @@ -54,9 +53,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.3 */ -@NotThreadSafe -public class DefaultBHttpServerConnection extends BHttpConnectionBase - implements HttpServerConnection { +public class DefaultBHttpServerConnection extends BHttpConnectionBase implements HttpServerConnection { private final ContentLengthStrategy incomingContentStrategy; private final ContentLengthStrategy outgoingContentStrategy; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -30,7 +30,8 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.net.Socket; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -45,7 +46,7 @@ import org.apache.hc.core5.http.io.HttpM * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultBHttpServerConnectionFactory implements HttpConnectionFactory { 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; @@ -49,7 +48,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.2 */ -@NotThreadSafe public class DefaultHttpRequestParser extends AbstractMessageParser { private final HttpRequestFactory requestFactory; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.io; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestFactory; import org.apache.hc.core5.http.config.MessageConstraints; @@ -42,7 +43,7 @@ import org.apache.hc.core5.http.message. * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpRequestParserFactory implements HttpMessageParserFactory { public static final DefaultHttpRequestParserFactory INSTANCE = new DefaultHttpRequestParserFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriter.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; @@ -43,7 +42,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.3 */ -@NotThreadSafe public class DefaultHttpRequestWriter extends AbstractMessageWriter { /** Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpRequestWriterFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.io; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.io.HttpMessageWriter; import org.apache.hc.core5.http.io.HttpMessageWriterFactory; @@ -39,7 +40,7 @@ import org.apache.hc.core5.http.message. * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpRequestWriterFactory implements HttpMessageWriterFactory { public static final DefaultHttpRequestWriterFactory INSTANCE = new DefaultHttpRequestWriterFactory(); 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponseFactory; @@ -49,7 +48,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.2 */ -@NotThreadSafe public class DefaultHttpResponseParser extends AbstractMessageParser { private final HttpResponseFactory responseFactory; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.io; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponseFactory; import org.apache.hc.core5.http.config.MessageConstraints; @@ -42,7 +43,7 @@ import org.apache.hc.core5.http.message. * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpResponseParserFactory implements HttpMessageParserFactory { public static final DefaultHttpResponseParserFactory INSTANCE = new DefaultHttpResponseParserFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriter.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; @@ -43,7 +42,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.3 */ -@NotThreadSafe public class DefaultHttpResponseWriter extends AbstractMessageWriter { /** Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/DefaultHttpResponseWriterFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.io; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.io.HttpMessageWriter; import org.apache.hc.core5.http.io.HttpMessageWriterFactory; @@ -39,7 +40,7 @@ import org.apache.hc.core5.http.message. * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpResponseWriterFactory implements HttpMessageWriterFactory { public static final DefaultHttpResponseWriterFactory INSTANCE = new DefaultHttpResponseWriterFactory(); 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -29,7 +29,8 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; @@ -58,7 +59,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class HttpRequestExecutor { public static final int DEFAULT_WAIT_FOR_CONTINUE = 3000; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -29,7 +29,8 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpEntity; @@ -77,7 +78,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class HttpService { private final HttpProcessor processor; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityInputStream.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.InputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.StreamClosedException; import org.apache.hc.core5.http.io.SessionInputBuffer; import org.apache.hc.core5.util.Args; @@ -47,7 +46,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class IdentityInputStream extends InputStream { private final SessionInputBuffer buffer; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/IdentityOutputStream.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.io import java.io.IOException; import java.io.OutputStream; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.StreamClosedException; import org.apache.hc.core5.http.io.SessionOutputBuffer; import org.apache.hc.core5.util.Args; @@ -47,7 +46,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class IdentityOutputStream extends OutputStream { private final SessionOutputBuffer buffer; 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=1747291&r1=1747290&r2=1747291&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 Tue Jun 7 18:26:44 2016 @@ -34,7 +34,6 @@ import java.nio.CharBuffer; import java.nio.charset.CharsetDecoder; import java.nio.charset.CoderResult; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Chars; import org.apache.hc.core5.http.MessageConstraintException; import org.apache.hc.core5.http.config.MessageConstraints; @@ -56,7 +55,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.3 */ -@NotThreadSafe public class SessionInputBufferImpl implements SessionInputBuffer { private final BasicHttpTransportMetrics metrics; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java Tue Jun 7 18:26:44 2016 @@ -34,7 +34,6 @@ import java.nio.CharBuffer; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Chars; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.io.HttpTransportMetrics; @@ -53,7 +52,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.3 */ -@NotThreadSafe public class SessionOutputBufferImpl implements SessionOutputBuffer { private static final byte[] CRLF = new byte[] {Chars.CR, Chars.LF}; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentDecoder.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.ContentDecoder; import org.apache.hc.core5.http.nio.SessionInputBuffer; @@ -43,7 +42,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractContentDecoder implements ContentDecoder { final ReadableByteChannel channel; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractContentEncoder.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.ContentEncoder; import org.apache.hc.core5.http.nio.SessionOutputBuffer; @@ -44,7 +43,6 @@ import org.apache.hc.core5.util.Asserts; * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractContentEncoder implements ContentEncoder { final WritableByteChannel channel; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageParser.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpMessage; import org.apache.hc.core5.http.MessageConstraintException; @@ -49,7 +48,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractMessageParser> implements NHttpMessageParser { private static final int READ_HEAD_LINE = 0; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractMessageWriter.java Tue Jun 7 18:26:44 2016 @@ -30,7 +30,6 @@ package org.apache.hc.core5.http.impl.ni import java.io.IOException; import java.util.Iterator; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.FormattedHeader; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; @@ -48,7 +47,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public abstract class AbstractMessageWriter> implements NHttpMessageWriter { private final CharArrayBuffer lineBuf; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/BasicAsyncRequestHandler.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,8 @@ package org.apache.hc.core5.http.impl.ni import java.io.IOException; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.io.HttpRequestHandler; @@ -47,7 +48,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class BasicAsyncRequestHandler implements HttpAsyncRequestHandler { private final HttpRequestHandler handler; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkDecoder.java Tue Jun 7 18:26:44 2016 @@ -33,7 +33,6 @@ import java.nio.channels.ReadableByteCha import java.util.ArrayList; import java.util.List; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.MalformedChunkCodingException; @@ -53,7 +52,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public class ChunkDecoder extends AbstractContentDecoder { private static final int READ_CONTENT = 0; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ChunkEncoder.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.FormattedHeader; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.TrailerSupplier; @@ -46,7 +45,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.0 */ -@NotThreadSafe public class ChunkEncoder extends AbstractContentEncoder { private final int fragHint; private final CharArrayBuffer lineBuffer; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpClientIODispatch.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,8 @@ import java.io.IOException; import javax.net.ssl.SSLContext; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.config.ConnectionConfig; import org.apache.hc.core5.http.nio.NHttpClientEventHandler; import org.apache.hc.core5.http.nio.NHttpConnectionFactory; @@ -47,7 +48,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.2 */ -@Immutable // provided injected dependencies are immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpClientIODispatch extends AbstractIODispatch { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParser.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,6 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestFactory; @@ -46,7 +45,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.1 */ -@NotThreadSafe public class DefaultHttpRequestParser extends AbstractMessageParser { private final HttpRequestFactory requestFactory; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestParserFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestFactory; import org.apache.hc.core5.http.config.MessageConstraints; @@ -42,7 +43,7 @@ import org.apache.hc.core5.http.nio.NHtt * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpRequestParserFactory implements NHttpMessageParserFactory { public static final DefaultHttpRequestParserFactory INSTANCE = new DefaultHttpRequestParserFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriter.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.ni import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; @@ -43,7 +42,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.1 */ -@NotThreadSafe public class DefaultHttpRequestWriter extends AbstractMessageWriter { /** Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpRequestWriterFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.message.BasicLineFormatter; import org.apache.hc.core5.http.message.LineFormatter; @@ -39,7 +40,7 @@ import org.apache.hc.core5.http.nio.NHtt * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpRequestWriterFactory implements NHttpMessageWriterFactory { public static final DefaultHttpRequestWriterFactory INSTANCE = new DefaultHttpRequestWriterFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParser.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,6 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponseFactory; @@ -46,7 +45,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.1 */ -@NotThreadSafe public class DefaultHttpResponseParser extends AbstractMessageParser { private final HttpResponseFactory responseFactory; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseParserFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponseFactory; import org.apache.hc.core5.http.config.MessageConstraints; @@ -42,7 +43,7 @@ import org.apache.hc.core5.http.nio.NHtt * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpResponseParserFactory implements NHttpMessageParserFactory { public static final DefaultHttpResponseParserFactory INSTANCE = new DefaultHttpResponseParserFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriter.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.ni import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; @@ -43,7 +42,6 @@ import org.apache.hc.core5.util.CharArra * * @since 4.1 */ -@NotThreadSafe public class DefaultHttpResponseWriter extends AbstractMessageWriter { /** Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpResponseWriterFactory.java Tue Jun 7 18:26:44 2016 @@ -27,7 +27,8 @@ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.message.BasicLineFormatter; import org.apache.hc.core5.http.message.LineFormatter; @@ -39,7 +40,7 @@ import org.apache.hc.core5.http.nio.NHtt * * @since 4.3 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpResponseWriterFactory implements NHttpMessageWriterFactory { public static final DefaultHttpResponseWriterFactory INSTANCE = new DefaultHttpResponseWriterFactory(); Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultHttpServerIODispatch.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,8 @@ import java.io.IOException; import javax.net.ssl.SSLContext; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.config.ConnectionConfig; import org.apache.hc.core5.http.nio.NHttpConnectionFactory; import org.apache.hc.core5.http.nio.NHttpServerEventHandler; @@ -47,7 +48,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.2 */ -@Immutable // provided injected dependencies are immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultHttpServerIODispatch extends AbstractIODispatch { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnection.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.channels.SelectionKey; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; @@ -59,7 +58,6 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.0 */ -@NotThreadSafe public class DefaultNHttpClientConnection extends NHttpConnectionBase implements NHttpClientConnection { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpClientConnectionFactory.java Tue Jun 7 18:26:44 2016 @@ -26,7 +26,8 @@ */ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -44,7 +45,7 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultNHttpClientConnectionFactory implements NHttpConnectionFactory { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnection.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.channels.SelectionKey; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; @@ -58,7 +57,6 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.0 */ -@NotThreadSafe public class DefaultNHttpServerConnection extends NHttpConnectionBase implements NHttpServerConnection { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/DefaultNHttpServerConnectionFactory.java Tue Jun 7 18:26:44 2016 @@ -26,7 +26,8 @@ */ package org.apache.hc.core5.http.impl.nio; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -44,7 +45,7 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class DefaultNHttpServerConnectionFactory implements NHttpConnectionFactory { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ExpandableBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ExpandableBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ExpandableBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ExpandableBuffer.java Tue Jun 7 18:26:44 2016 @@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.ni import java.nio.ByteBuffer; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.ByteBufferAllocator; @@ -42,7 +41,6 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.0 */ -@NotThreadSafe public class ExpandableBuffer { public final static int INPUT_MODE = 0; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequestExecutor.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,8 @@ import java.net.SocketTimeoutException; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.ExceptionLogger; @@ -85,7 +86,7 @@ import org.apache.hc.core5.util.Asserts; * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class HttpAsyncRequestExecutor implements NHttpClientEventHandler { public static final int DEFAULT_WAIT_FOR_CONTINUE = 3000; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequester.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequester.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequester.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncRequester.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,8 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.Future; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.concurrent.BasicFuture; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.ConnectionClosedException; @@ -57,7 +58,7 @@ import org.apache.hc.core5.util.Args; * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class HttpAsyncRequester { private final HttpProcessor httpprocessor; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/HttpAsyncService.java Tue Jun 7 18:26:44 2016 @@ -34,7 +34,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.concurrent.Cancellable; import org.apache.hc.core5.http.ConnectionReuseStrategy; import org.apache.hc.core5.http.ExceptionLogger; @@ -104,7 +105,7 @@ import org.apache.hc.core5.util.Asserts; * * @since 4.2 */ -@Immutable // provided injected dependencies are immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class HttpAsyncService implements NHttpServerEventHandler { static final String HTTP_EXCHANGE_STATE = "http.nio.http-exchange-state"; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityDecoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityDecoder.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.FileContentDecoder; import org.apache.hc.core5.http.nio.SessionInputBuffer; @@ -50,7 +49,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class IdentityDecoder extends AbstractContentDecoder implements FileContentDecoder { public IdentityDecoder( Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityEncoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityEncoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityEncoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/IdentityEncoder.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.WritableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.FileContentEncoder; import org.apache.hc.core5.http.nio.SessionOutputBuffer; @@ -49,7 +48,6 @@ import org.apache.hc.core5.http.nio.Sess * * @since 4.0 */ -@NotThreadSafe public class IdentityEncoder extends AbstractContentEncoder implements FileContentEncoder { private final int fragHint; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedDecoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedDecoder.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.ConnectionClosedException; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.FileContentDecoder; @@ -52,7 +51,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class LengthDelimitedDecoder extends AbstractContentDecoder implements FileContentDecoder { private final long contentLength; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedEncoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedEncoder.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedEncoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/LengthDelimitedEncoder.java Tue Jun 7 18:26:44 2016 @@ -32,7 +32,6 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.WritableByteChannel; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.impl.BasicHttpTransportMetrics; import org.apache.hc.core5.http.nio.FileContentEncoder; import org.apache.hc.core5.http.nio.SessionOutputBuffer; @@ -51,7 +50,6 @@ import org.apache.hc.core5.util.Args; * * @since 4.0 */ -@NotThreadSafe public class LengthDelimitedEncoder extends AbstractContentEncoder implements FileContentEncoder { private final long contentLength; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpClientConnectionFactory.java Tue Jun 7 18:26:44 2016 @@ -28,7 +28,8 @@ package org.apache.hc.core5.http.impl.ni import javax.net.ssl.SSLContext; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -50,7 +51,7 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class SSLNHttpClientConnectionFactory implements NHttpConnectionFactory { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SSLNHttpServerConnectionFactory.java Tue Jun 7 18:26:44 2016 @@ -28,7 +28,8 @@ package org.apache.hc.core5.http.impl.ni import javax.net.ssl.SSLContext; -import org.apache.hc.core5.annotation.Immutable; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ContentLengthStrategy; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; @@ -50,7 +51,7 @@ import org.apache.hc.core5.util.ByteBuff * * @since 4.2 */ -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public class SSLNHttpServerConnectionFactory implements NHttpConnectionFactory { Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java Tue Jun 7 18:26:44 2016 @@ -36,7 +36,6 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CoderResult; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Chars; import org.apache.hc.core5.http.MessageConstraintException; import org.apache.hc.core5.http.config.MessageConstraints; @@ -52,7 +51,6 @@ import org.apache.hc.core5.util.HeapByte * * @since 4.0 */ -@NotThreadSafe public class SessionInputBufferImpl extends ExpandableBuffer implements SessionInputBuffer { private final CharsetDecoder chardecoder; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java Tue Jun 7 18:26:44 2016 @@ -37,7 +37,6 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.Chars; import org.apache.hc.core5.http.nio.SessionOutputBuffer; import org.apache.hc.core5.util.Args; @@ -51,7 +50,6 @@ import org.apache.hc.core5.util.HeapByte * * @since 4.0 */ -@NotThreadSafe public class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputBuffer { private static final byte[] CRLF = new byte[] {Chars.CR, Chars.LF}; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedInputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedInputBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedInputBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedInputBuffer.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,8 @@ import java.io.InterruptedIOException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.hc.core5.annotation.ThreadSafe; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.nio.ContentDecoder; import org.apache.hc.core5.http.nio.ContentInputBuffer; import org.apache.hc.core5.http.nio.IOControl; @@ -55,7 +56,7 @@ import org.apache.hc.core5.util.HeapByte * * @since 4.0 */ -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class SharedInputBuffer extends ExpandableBuffer implements ContentInputBuffer { private final ReentrantLock lock; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedOutputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedOutputBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedOutputBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SharedOutputBuffer.java Tue Jun 7 18:26:44 2016 @@ -31,7 +31,8 @@ import java.io.InterruptedIOException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import org.apache.hc.core5.annotation.ThreadSafe; +import org.apache.hc.core5.annotation.Contract; +import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.nio.ContentEncoder; import org.apache.hc.core5.http.nio.ContentOutputBuffer; import org.apache.hc.core5.http.nio.IOControl; @@ -56,7 +57,7 @@ import org.apache.hc.core5.util.HeapByte * * @since 4.0 */ -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class SharedOutputBuffer extends ExpandableBuffer implements ContentOutputBuffer { private final ReentrantLock lock; Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleInputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleInputBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleInputBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SimpleInputBuffer.java Tue Jun 7 18:26:44 2016 @@ -28,7 +28,6 @@ package org.apache.hc.core5.http.impl.ni import java.io.IOException; -import org.apache.hc.core5.annotation.NotThreadSafe; import org.apache.hc.core5.http.nio.ContentDecoder; import org.apache.hc.core5.http.nio.ContentInputBuffer; import org.apache.hc.core5.util.ByteBufferAllocator; @@ -41,7 +40,6 @@ import org.apache.hc.core5.util.HeapByte * * @since 4.0 */ -@NotThreadSafe public class SimpleInputBuffer extends ExpandableBuffer implements ContentInputBuffer { private boolean endOfStream = false;