Add deprecated forRemoval attribute to server-side code

conjure-java-core/src/main/java/com/palantir/conjure/java/services/JerseyServiceGenerator.java

@@ -187,10 +187,15 @@ private MethodSpec generateServiceMethod(
                     .build());
         }
 
-        endpointDef
-                .getDeprecated()
-                .ifPresent(
-                        deprecatedDocsValue -> methodBuilder.addAnnotation(ClassName.get("java.lang", "Deprecated")));
+        endpointDef.getDeprecated().ifPresent(_deprecatedValue -> {
+            if (endpointDef.getTags().contains("deprecated-for-removal")) {
+                methodBuilder.addAnnotation(AnnotationSpec.builder(Deprecated.class)
+                        .addMember("forRemoval", "true")
+                        .build());
+            } else {
+                methodBuilder.addAnnotation(Deprecated.class);
+            }
+        });
 
         methodBuilder.addAnnotations(ConjureAnnotations.getClientEndpointAnnotations(endpointDef));
 

conjure-java-core/src/main/java/com/palantir/conjure/java/services/UndertowServiceHandlerGenerator.java

@@ -234,12 +234,18 @@ private TypeSpec generateEndpointHandler(
                 .addCode(endpointInvocation(
                         endpointDefinition, typeDefinitions, typeMapper, returnTypeMapper, safetyEvaluator));
 
-        endpointDefinition
-                .getDeprecated()
-                .ifPresent(deprecatedDocsValue ->
-                        handleMethodBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
-                                .addMember("value", "$S", "deprecation")
-                                .build()));
+        endpointDefinition.getDeprecated().ifPresent(_deprecatedValue -> {
+            if (endpointDefinition.getTags().contains("deprecated-for-removal")) {
+                handleMethodBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
+                        .addMember("value", "$S", "deprecation")
+                        .addMember("value", "$S", "removal")
+                        .build());
+            } else {
+                handleMethodBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class)
+                        .addMember("value", "$S", "deprecation")
+                        .build());
+            }
+        });
 
         MethodSpec.Builder ctorBuilder = MethodSpec.constructorBuilder()
                 .addParameter(UndertowRuntime.class, RUNTIME_VAR_NAME)

conjure-java-core/src/main/java/com/palantir/conjure/java/services/UndertowServiceInterfaceGenerator.java

@@ -36,6 +36,7 @@
 import com.palantir.conjure.spec.ServiceDefinition;
 import com.palantir.tokens.auth.AuthHeader;
 import com.palantir.tokens.auth.BearerToken;
+import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
@@ -94,7 +95,15 @@ private MethodSpec generateServiceInterfaceMethod(
                 .addParameters(createServiceMethodParameters(endpointDef, safetyEvaluator, typeMapper))
                 .addAnnotations(ConjureAnnotations.incubating(endpointDef));
 
-        endpointDef.getDeprecated().ifPresent(deprecatedDocsValue -> methodBuilder.addAnnotation(Deprecated.class));
+        endpointDef.getDeprecated().ifPresent(_deprecatedValue -> {
+            if (endpointDef.getTags().contains("deprecated-for-removal")) {
+                methodBuilder.addAnnotation(AnnotationSpec.builder(Deprecated.class)
+                        .addMember("forRemoval", "true")
+                        .build());
+            } else {
+                methodBuilder.addAnnotation(Deprecated.class);
+            }
+        });
 
         methodBuilder.addJavadoc("$L", ServiceGenerators.getJavaDocWithRequestLine(endpointDef));