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/06/07 18:26:46 UTC
svn commit: r1747291 [4/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...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java Tue Jun 7 18:26:44 2016
@@ -27,7 +27,8 @@
package org.apache.hc.core5.reactor;
-import org.apache.hc.core5.annotation.NotThreadSafe;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.util.Args;
/**
@@ -35,7 +36,7 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.2
*/
-@NotThreadSafe
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
public final class IOReactorConfig {
private static final int AVAIL_PROCS = Runtime.getRuntime().availableProcessors();
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOSessionImpl.java Tue Jun 7 18:26:44 2016
@@ -38,7 +38,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-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.util.Args;
/**
@@ -46,7 +47,7 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.0
*/
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE)
public class IOSessionImpl implements IOSession, SocketAccessor {
private final SelectionKey key;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ListenerEndpointImpl.java Tue Jun 7 18:26:44 2016
@@ -32,7 +32,8 @@ import java.net.SocketAddress;
import java.nio.channels.Channel;
import java.nio.channels.SelectionKey;
-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.util.Args;
/**
@@ -40,7 +41,7 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.0
*/
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public class ListenerEndpointImpl implements ListenerEndpoint {
private volatile boolean completed;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestHandle.java Tue Jun 7 18:26:44 2016
@@ -27,7 +27,6 @@
package org.apache.hc.core5.reactor;
-import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
/**
@@ -37,7 +36,6 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.0
*/
-@Immutable
public class SessionRequestHandle {
private final SessionRequestImpl sessionRequest;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/SessionRequestImpl.java Tue Jun 7 18:26:44 2016
@@ -32,7 +32,8 @@ import java.net.SocketAddress;
import java.nio.channels.Channel;
import java.nio.channels.SelectionKey;
-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.util.Args;
/**
@@ -40,7 +41,7 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.0
*/
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public class SessionRequestImpl implements SessionRequest {
private volatile boolean completed;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java Tue Jun 7 18:26:44 2016
@@ -43,7 +43,8 @@ import javax.net.ssl.SSLEngineResult.Sta
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
-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.HttpHost;
import org.apache.hc.core5.reactor.EventMask;
import org.apache.hc.core5.reactor.IOSession;
@@ -69,7 +70,7 @@ import org.apache.hc.core5.util.Asserts;
*
* @since 4.2
*/
-@ThreadSafe
+@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public class SSLIOSession implements IOSession, SessionBufferStatus, SocketAccessor {
/**
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java Tue Jun 7 18:26:44 2016
@@ -59,7 +59,6 @@ import javax.net.ssl.TrustManagerFactory
import javax.net.ssl.X509ExtendedKeyManager;
import javax.net.ssl.X509TrustManager;
-import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.util.Args;
/**
@@ -74,7 +73,6 @@ import org.apache.hc.core5.util.Args;
*
* @since 4.4
*/
-@NotThreadSafe
public class SSLContextBuilder {
static final String TLS = "TLS";
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContexts.java Tue Jun 7 18:26:44 2016
@@ -32,8 +32,6 @@ import java.security.NoSuchAlgorithmExce
import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.annotation.Immutable;
-
/**
* {@link javax.net.ssl.SSLContext} factory methods.
*
@@ -48,7 +46,6 @@ import org.apache.hc.core5.annotation.Im
* </a>
* @since 4.4
*/
-@Immutable
public class SSLContexts {
private SSLContexts() {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java Tue Jun 7 18:26:44 2016
@@ -29,14 +29,11 @@ package org.apache.hc.core5.util;
import java.io.Serializable;
-import org.apache.hc.core5.annotation.NotThreadSafe;
-
/**
* A resizable byte array.
*
* @since 4.0
*/
-@NotThreadSafe
public final class ByteArrayBuffer implements Serializable {
private static final long serialVersionUID = 4359112959524048036L;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java Tue Jun 7 18:26:44 2016
@@ -30,7 +30,6 @@ package org.apache.hc.core5.util;
import java.io.Serializable;
import java.nio.CharBuffer;
-import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.http.Chars;
/**
@@ -38,7 +37,6 @@ import org.apache.hc.core5.http.Chars;
*
* @since 4.0
*/
-@NotThreadSafe
public final class CharArrayBuffer implements CharSequence, Serializable {
private static final long serialVersionUID = -6208952725094867135L;
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/DirectByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/DirectByteBufferAllocator.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/DirectByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/DirectByteBufferAllocator.java Tue Jun 7 18:26:44 2016
@@ -29,7 +29,9 @@ package org.apache.hc.core5.util;
import java.nio.ByteBuffer;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
+
/**
* Allocates {@link ByteBuffer} instances using
@@ -37,7 +39,7 @@ import org.apache.hc.core5.annotation.Im
*
* @since 4.0
*/
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class DirectByteBufferAllocator implements ByteBufferAllocator {
public static final DirectByteBufferAllocator INSTANCE = new DirectByteBufferAllocator();
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/HeapByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/HeapByteBufferAllocator.java?rev=1747291&r1=1747290&r2=1747291&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/HeapByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/HeapByteBufferAllocator.java Tue Jun 7 18:26:44 2016
@@ -29,7 +29,8 @@ package org.apache.hc.core5.util;
import java.nio.ByteBuffer;
-import org.apache.hc.core5.annotation.Immutable;
+import org.apache.hc.core5.annotation.Contract;
+import org.apache.hc.core5.annotation.ThreadingBehavior;
/**
* Allocates {@link ByteBuffer} instances using
@@ -37,7 +38,7 @@ import org.apache.hc.core5.annotation.Im
*
* @since 4.0
*/
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
public class HeapByteBufferAllocator implements ByteBufferAllocator {
public static final HeapByteBufferAllocator INSTANCE = new HeapByteBufferAllocator();