Remove dependency on jcip-annotations

Author: kcooney

Diff for: .classpath

@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar" sourcepath="lib/hamcrest-core-1.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jcip-annotations-1.0.jar" sourcepath="jcip-annotations-1.0-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Diff for: build.xml

@@ -31,10 +31,6 @@
   <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
   <property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
   <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
-  <property name="jciplib" location="lib/jcip-annotations-1.0.jar" />
-  <property name="jciplibsources" location="lib/jcip-annotations-1.0-sources.jar" />
-  <property name="jciplib" location="lib/jcip-annotations-1.0.jar" />
-  <property name="jciplibsources" location="lib/jcip-annotations-1.0-sources.jar" />
 
   <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
 
@@ -84,10 +80,9 @@
   </macrodef>
 
   <target name="build" depends="versiontag">
-    <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib};${jciplib}"/>
+    <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
     <unjar src="${hamcrestlib}" dest="${bin}" />
-    <unjar src="${jciplib}" dest="${bin}" />
-    <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${jciplib};${bin}"/>
+    <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
   </target>
 
   <target name="jars" depends="build">
@@ -130,9 +125,8 @@
     </copy>
   </target>
 
-  <target name="unjar.deps">
+  <target name="unjar.hamcrest">
     <unjar src="${hamcrestlibsources}" dest="${hamcrestsrc}" />
-    <unjar src="${jciplibsources}" dest="${jcipsrc}" />
   </target>
 
   <target name="release-notes">
@@ -144,7 +138,7 @@
     </exec>
   </target>
 
-  <target name="javadoc" depends="unjar.deps">
+  <target name="javadoc" depends="unjar.hamcrest">
     <javadoc destdir="${javadocdir}"
              author="false"
              version="false"
@@ -158,7 +152,6 @@
 
       <sourcepath location="${src}" />
       <sourcepath location="${hamcrestsrc}" />
-      <sourcepath location="${jcipsrc}" />
       <link href="http://java.sun.com/javase/6/docs/api/" />
     </javadoc>
   </target>
@@ -205,7 +198,6 @@
           <pathelement location="${bin}" />
           <pathelement location="${testbin}" />
           <pathelement location="${hamcrestlib}" />
-          <pathelement location="${jciplib}" />
         </classpath>
       </java>    
     </sequential>

Diff for: lib/jcip-annotations-1.0-sources.jar

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -93,11 +93,6 @@
             <artifactId>hamcrest-core</artifactId>
             <version>1.3</version>
         </dependency>
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-            <version>1.0</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -261,7 +256,6 @@
                     <includeDependencySources>true</includeDependencySources>
                     <dependencySourceIncludes>
                         <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude>
-                        <dependencySourceInclude>net.jcip:jcip-annotations:*</dependencySourceInclude>
                     </dependencySourceIncludes>
                 </configuration>
             </plugin>
@@ -346,4 +340,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

Diff for: lib/jcip-annotations-1.0.jar

@@ -1,15 +1,15 @@
 package org.junit.runner;
 
-import net.jcip.annotations.ThreadSafe;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
 import java.io.Serializable;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.junit.runner.notification.Concurrent;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
 /**
  * A <code>Result</code> collects and summarizes information from running multiple tests.
  * All tests are counted -- additional information is collected from tests that fail.
@@ -66,7 +66,7 @@ public boolean wasSuccessful() {
         return getFailureCount() == 0;
     }
 
-    @ThreadSafe
+    @Concurrent
     private class Listener extends RunListener {
         @Override
         public void testRunStarted(Description description) throws Exception {

Diff for: pom.xml

@@ -0,0 +1,21 @@
+// Copyright 2013 Google Inc. All Rights Reserved.
+
+package org.junit.runner.notification;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates a {@link RunListener} that can have its methods called
+ * concurrently. This implies that the class is thread-safe (i.e. no set of
+ * listener calls can put the listener into an invalid state, even if those
+ * listener calls are being made by multiple threads without synchronization.
+ */
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Concurrent {
+}

Diff for: src/main/java/org/junit/runner/Result.java

@@ -1,9 +1,5 @@
 package org.junit.runner.notification;
 
-import java.lang.annotation.Annotation;
-
-import net.jcip.annotations.ThreadSafe;
-
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 
@@ -20,17 +16,13 @@
  *
  * @see RunNotifier
  */
-@ThreadSafe
+@Concurrent
 final class SynchronizedRunListener extends RunListener {
     private static final Object sMonitor = new Object();
     private final RunListener fListener;
 
     public static RunListener wrapIfNotThreadSafe(RunListener listener) {
-        Class<? extends Annotation> annotation= getThreadSafeAnnotationClass();
-        if (annotation == null) {
-            return listener;
-        }
-        boolean isThreadSafe = listener.getClass().isAnnotationPresent(annotation);
+        boolean isThreadSafe = listener.getClass().isAnnotationPresent(Concurrent.class);
         return isThreadSafe ? listener : new SynchronizedRunListener(listener);
     }
 
@@ -109,37 +101,4 @@ public boolean equals(Object other) {
     public String toString() {
         return fListener.toString();
     }
-    
-    /**
-     * Loads {@link net.jcip.annotations.ThreadSafe} via reflection. Uses the
-     * Initialization on Demand Holder pattern (see
-     * http://www.cs.umd.edu/~pugh/java/memoryModel/jsr-133-faq.html#dcl for details).
-     */
-    private static class ThreadSafeAnnotationHolder {
-        private static Class<? extends Annotation> annotation = loadThreadSafeAnnotation();
-        
-
-        private static Class<? extends Annotation> loadThreadSafeAnnotation() {
-            try {
-                ClassLoader classLoader= Thread.currentThread().getContextClassLoader();
-                Class<?> loadedAnnotation= classLoader.loadClass(
-                        "net.jcip.annotations.ThreadSafe");
-                return loadedAnnotation.asSubclass(Annotation.class);
-            } catch (ClassNotFoundException e) {
-                return null;
-            } catch (ClassCastException e) {
-                return null;
-            }
-        }
-    }
- 
-    /**
-     * Gets the {@link net.jcip.annotations.ThreadSafe} annotation if it is on
-     * the classpath
-     *
-     * @return the annotation or {@code null} if it isn't on the classpath
-     */
-    static Class<? extends Annotation> getThreadSafeAnnotationClass() {
-        return ThreadSafeAnnotationHolder.annotation;
-    }
 }

Diff for: src/main/java/org/junit/runner/notification/Concurrent.java

@@ -5,7 +5,6 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.jcip.annotations.ThreadSafe;
 import org.junit.Test;
 import org.junit.runner.Description;
 
@@ -28,7 +27,7 @@ public void testStarted(Description description) throws Exception {
         }
     }
 
-    @ThreadSafe
+    @Concurrent
     public static class ThreadSafeListener extends RunListener {
         final AtomicInteger testStarted = new AtomicInteger(0);
 

Diff for: src/main/java/org/junit/runner/notification/SynchronizedRunListener.java

@@ -6,7 +6,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import junit.framework.TestCase;
-import net.jcip.annotations.ThreadSafe;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 
@@ -114,7 +113,7 @@ public void testStarted(Description description) throws Exception {
         }
     }
 
-    @ThreadSafe
+    @Concurrent
     private static class ThreadSafeListener extends CountingListener {
     }
 

Diff for: src/test/java/org/junit/runner/notification/AddRemoveListenerTest.java

@@ -14,7 +14,6 @@
 import java.util.List;
 import java.util.Set;
 
-import net.jcip.annotations.ThreadSafe;
 import org.junit.Test;
 
 /**
@@ -100,7 +99,7 @@ public boolean equals(Object obj) {
         }
     }
 
-    @ThreadSafe
+    @Concurrent
     private static class ThreadSafeRunListener extends RunListener {
     }
 
@@ -165,9 +164,4 @@ public void wrapIfNotThreadSafeShouldWrapNonThreadSafeListeners() {
         RunListener wrappedListener= SynchronizedRunListener.wrapIfNotThreadSafe(listener);
         assertThat(wrappedListener, instanceOf(SynchronizedRunListener.class));
     }
-
-    @Test
-    public void dynamicallyLoadsThreadSafeAnnotatoin() {
-        assertEquals(ThreadSafe.class, SynchronizedRunListener.getThreadSafeAnnotationClass());
-    }
 }