Merge pull request #796 from jglick/deprecated

Added `@Deprecated` where `@deprecated` already in Javadoc

Author: jtnord

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java

@@ -33,6 +33,7 @@
 /**
  * @deprecated Use {@link CpsFlowFactoryAction2} instead.
  */
+@Deprecated
 public interface CpsFlowFactoryAction extends Action {
     CpsFlowExecution create(CpsFlowDefinition def, FlowExecutionOwner owner, List<? extends Action> actions) throws IOException;
 }

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java

@@ -223,6 +223,7 @@ public Object invokeMethod(String name, Object args) {
      * When {@link #invokeMethod(String, Object)} is calling a {@link StepDescriptor}
      * @deprecated Prefer {@link #invokeStep(StepDescriptor, String, Object)}
      */
+    @Deprecated
     protected Object invokeStep(StepDescriptor d, Object args) {
         return invokeStep(d, d.getFunctionName(), args);
     }
@@ -798,6 +799,7 @@ private boolean invokeBodiesAndSwitchToAsyncMode(CpsThread cur) {
          * @deprecated
          *      Unused as of 1.2. Left here for serialization compatibility.
          */
+        @Deprecated
         private static class HeadCollector extends BodyExecutionCallback {
             private final CpsStepContext context;
             private final FlowHead head;

plugin/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java

@@ -45,6 +45,7 @@
  * @author Kohsuke Kawaguchi
  * @deprecated inline relevant parts
  */
+@Deprecated
 public abstract class SingleJobTestBase extends Assert {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@@ -72,13 +73,15 @@ public void rebuildContext(JenkinsRule j) throws Exception {
     }
 
     /** @deprecated use {@link JenkinsRule#waitForCompletion} instead */
+    @Deprecated
     public void waitForWorkflowToComplete() throws Exception {
         do {
             waitForWorkflowToSuspend(e);
         } while (!e.isComplete());
     }
 
     /** @deprecated Use some other idiom, like {@link SemaphoreStep}. */
+    @Deprecated
     public void waitForWorkflowToSuspend() throws Exception {
         waitForWorkflowToSuspend(e);
     }