Remove EnsuresCalledMethodsVarArgs.java

typetools · Jul 18, 2024 · 32ef093 · 32ef093
1 parent 034a63c
commit 32ef093
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 37 deletions.
diff --git a/...ods/qual/EnsuresCalledMethodsVarArgs.java → ...qual/EnsuresCalledMethodsVarargs.java.tmp b/...ods/qual/EnsuresCalledMethodsVarArgs.java → ...qual/EnsuresCalledMethodsVarargs.java.tmp
diff --git a/...in/java/org/checkerframework/checker/calledmethods/CalledMethodsAnnotatedTypeFactory.java b/...in/java/org/checkerframework/checker/calledmethods/CalledMethodsAnnotatedTypeFactory.java
@@ -78,18 +78,6 @@ public class CalledMethodsAnnotatedTypeFactory extends AccumulationAnnotatedType
   /*package-private*/ final ExecutableElement ensuresCalledMethodsVarargsValueElement =
       TreeUtils.getMethod(EnsuresCalledMethodsVarargs.class, "value", 0, processingEnv);
 
-  /**
-   * The {@link org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethodsVarargs#value}
-   * element/argument.
-   */
-  @SuppressWarnings("deprecation") // EnsuresCalledMethodsVarArgs
-  /*package-private*/ final ExecutableElement ensuresCalledMethodsVarArgsValueElement =
-      TreeUtils.getMethod(
-          org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethodsVarArgs.class,
-          "value",
-          0,
-          processingEnv);
-
   /** The {@link EnsuresCalledMethodsOnException#value} element/argument. */
   /*package-private*/ final ExecutableElement ensuresCalledMethodsOnExceptionValueElement =
       TreeUtils.getMethod(EnsuresCalledMethodsOnException.class, "value", 0, processingEnv);

diff --git a/checker/src/main/java/org/checkerframework/checker/calledmethods/CalledMethodsTransfer.java b/checker/src/main/java/org/checkerframework/checker/calledmethods/CalledMethodsTransfer.java
@@ -221,13 +221,6 @@ private void handleEnsuresCalledMethodsVarargs(
       ExecutableElement elt,
       TransferResult<AccumulationValue, AccumulationStore> result) {
     AnnotationMirror annot = atypeFactory.getDeclAnnotation(elt, EnsuresCalledMethodsVarargs.class);
-    // Temporary, for backward compatibility.
-    if (annot == null) {
-      annot =
-          atypeFactory.getDeclAnnotation(
-              elt,
-              org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethodsVarArgs.class);
-    }
     if (annot == null) {
       return;
     }
@@ -237,15 +230,6 @@ private void handleEnsuresCalledMethodsVarargs(
             ((CalledMethodsAnnotatedTypeFactory) atypeFactory)
                 .ensuresCalledMethodsVarargsValueElement,
             String.class);
-    // Temporary, for backward compatibility.
-    if (ensuredMethodNames.isEmpty()) {
-      ensuredMethodNames =
-          AnnotationUtils.getElementValueArray(
-              annot,
-              ((CalledMethodsAnnotatedTypeFactory) atypeFactory)
-                  .ensuresCalledMethodsVarArgsValueElement,
-              String.class);
-    }
     List<? extends VariableElement> parameters = elt.getParameters();
     int varArgsPos = parameters.size() - 1;
     Node varArgActual = node.getArguments().get(varArgsPos);

diff --git a/checker/src/main/java/org/checkerframework/checker/calledmethods/CalledMethodsVisitor.java b/checker/src/main/java/org/checkerframework/checker/calledmethods/CalledMethodsVisitor.java
@@ -64,13 +64,6 @@ public Void visitAnnotation(AnnotationTree tree, Void p) {
   public void processMethodTree(MethodTree tree) {
     ExecutableElement elt = TreeUtils.elementFromDeclaration(tree);
     AnnotationMirror ecmv = atypeFactory.getDeclAnnotation(elt, EnsuresCalledMethodsVarargs.class);
-    // Temporary, for backward compatibility.
-    if (ecmv == null) {
-      ecmv =
-          atypeFactory.getDeclAnnotation(
-              elt,
-              org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethodsVarArgs.class);
-    }
     if (ecmv != null) {
       if (!elt.isVarArgs()) {
         checker.report(tree, new DiagMessage(Diagnostic.Kind.ERROR, "ensuresvarargs.invalid"));

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,9 +1,9 @@
-Version 3.45.1 (August 1, 2024)
+Version 3.46.0 (August 1, 2024)
 -----------------------------
 
 **User-visible changes:**
 
-Deprecated `@EnsuresCalledMethodsVarArgs`; use `@EnsuresCalledMethodsVarargs` instead.
+Renamed `@EnsuresCalledMethodsVarArgs`to `@EnsuresCalledMethodsVarargs`.
 
 **Implementation details:**