From 9f6856e597b72ed737807bf21f6c51235b7b57c6 Mon Sep 17 00:00:00 2001 From: rzpt <@> Date: Fri, 18 Nov 2022 10:39:22 -0800 Subject: [PATCH 1/4] fix eclipse warnings Remove @SuppressWarnings("deprecation") on deprecated methods. The annotation is for suppressing calls of deprecated methods, not implementation of deprecated methods. partial fix for #1635 --- .../integrationInput/java/com/palantir/product/Union.java | 2 -- .../java/test/prefix/com/palantir/product/Union.java | 2 -- .../java/com/palantir/conjure/java/types/UnionGenerator.java | 5 ----- .../test/resources/test/api/TestServiceAsync.java.dialogue | 2 -- .../resources/test/api/TestServiceAsync.java.dialogue.prefix | 2 -- .../resources/test/api/TestServiceBlocking.java.dialogue | 2 -- .../test/api/TestServiceBlocking.java.dialogue.prefix | 2 -- 7 files changed, 17 deletions(-) diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/Union.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/Union.java index 1177fd951..fd92e2e00 100644 --- a/conjure-java-core/src/integrationInput/java/com/palantir/product/Union.java +++ b/conjure-java-core/src/integrationInput/java/com/palantir/product/Union.java @@ -315,7 +315,6 @@ private int getValue() { } @Override - @SuppressWarnings("deprecation") public T accept(Visitor visitor) { return visitor.visitBar(value); } @@ -361,7 +360,6 @@ private long getValue() { } @Override - @SuppressWarnings("deprecation") public T accept(Visitor visitor) { return visitor.visitBaz(value); } diff --git a/conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/Union.java b/conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/Union.java index d91e75588..075c6027a 100644 --- a/conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/Union.java +++ b/conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/Union.java @@ -305,7 +305,6 @@ private int getValue() { } @Override - @SuppressWarnings("deprecation") public T accept(Visitor visitor) { return visitor.visitBar(value); } @@ -351,7 +350,6 @@ private long getValue() { } @Override - @SuppressWarnings("deprecation") public T accept(Visitor visitor) { return visitor.visitBaz(value); } diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java index d504e8948..9ddb67221 100644 --- a/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java +++ b/conjure-java-core/src/main/java/com/palantir/conjure/java/types/UnionGenerator.java @@ -910,11 +910,6 @@ private static MethodSpec createWrapperAcceptMethod( } else { methodBuilder.addStatement("return $N.$N($N)", visitor, visitMethodName, valueName); } - if (isDeprecated) { - methodBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class) - .addMember("value", "$S", "deprecation") - .build()); - } return methodBuilder.build(); } diff --git a/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue b/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue index 288d542f4..ebef1947a 100644 --- a/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue +++ b/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue @@ -30,7 +30,6 @@ import java.lang.Double; import java.lang.Integer; import java.lang.Override; import java.lang.String; -import java.lang.SuppressWarnings; import java.lang.Void; import java.util.Map; import java.util.Optional; @@ -437,7 +436,6 @@ public interface TestServiceAsync { } @Override - @SuppressWarnings("deprecation") public ListenableFuture> getBranchesDeprecated( AuthHeader authHeader, ResourceIdentifier datasetRid) { Request.Builder _request = Request.builder(); diff --git a/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue.prefix b/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue.prefix index 9043582c8..304ddfd59 100644 --- a/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue.prefix +++ b/conjure-java-core/src/test/resources/test/api/TestServiceAsync.java.dialogue.prefix @@ -26,7 +26,6 @@ import java.lang.Double; import java.lang.Integer; import java.lang.Override; import java.lang.String; -import java.lang.SuppressWarnings; import java.lang.Void; import java.util.Map; import java.util.Optional; @@ -437,7 +436,6 @@ public interface TestServiceAsync { } @Override - @SuppressWarnings("deprecation") public ListenableFuture> getBranchesDeprecated( AuthHeader authHeader, ResourceIdentifier datasetRid) { Request.Builder _request = Request.builder(); diff --git a/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue b/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue index 15012aca5..52fc86b7e 100644 --- a/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue +++ b/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue @@ -30,7 +30,6 @@ import java.lang.Double; import java.lang.Integer; import java.lang.Override; import java.lang.String; -import java.lang.SuppressWarnings; import java.lang.Void; import java.util.Map; import java.util.Optional; @@ -433,7 +432,6 @@ public interface TestServiceBlocking { } @Override - @SuppressWarnings("deprecation") public Set getBranchesDeprecated(AuthHeader authHeader, ResourceIdentifier datasetRid) { Request.Builder _request = Request.builder(); _request.putHeaderParams("Authorization", authHeader.toString()); diff --git a/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue.prefix b/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue.prefix index 092bb709b..497e66faa 100644 --- a/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue.prefix +++ b/conjure-java-core/src/test/resources/test/api/TestServiceBlocking.java.dialogue.prefix @@ -26,7 +26,6 @@ import java.lang.Double; import java.lang.Integer; import java.lang.Override; import java.lang.String; -import java.lang.SuppressWarnings; import java.lang.Void; import java.util.Map; import java.util.Optional; @@ -433,7 +432,6 @@ public interface TestServiceBlocking { } @Override - @SuppressWarnings("deprecation") public Set getBranchesDeprecated(AuthHeader authHeader, ResourceIdentifier datasetRid) { Request.Builder _request = Request.builder(); _request.putHeaderParams("Authorization", authHeader.toString()); From 791f5135edc51d4ddf38b155dac38dc95ca9ec12 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Fri, 18 Nov 2022 18:44:46 +0000 Subject: [PATCH 2/4] Add generated changelog entries --- changelog/@unreleased/pr-1917.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-1917.v2.yml diff --git a/changelog/@unreleased/pr-1917.v2.yml b/changelog/@unreleased/pr-1917.v2.yml new file mode 100644 index 000000000..c1c7e7801 --- /dev/null +++ b/changelog/@unreleased/pr-1917.v2.yml @@ -0,0 +1,6 @@ +type: improvement +improvement: + description: Generated code does not produce deprecation warnings in eclipse by + default + links: + - https://github.com/palantir/conjure-java/pull/1917 From 46813bc91dbff904f305be7b537eac29bf52f7d7 Mon Sep 17 00:00:00 2001 From: rzpt <@> Date: Fri, 18 Nov 2022 10:50:34 -0800 Subject: [PATCH 3/4] missed one --- .../dialogue/DefaultStaticFactoryMethodGenerator.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java index afeed3131..8fee22491 100644 --- a/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java +++ b/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java @@ -200,12 +200,6 @@ private MethodSpec clientImpl(EndpointDefinition def) { .addParameters(params) .addAnnotation(Override.class); - if (def.getDeprecated().isPresent()) { - methodBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class) - .addMember("value", "$S", "deprecation") - .build()); - } - TypeName returnType = methodType.switchBy(returnTypes.baseType(def.getReturns()), returnTypes.async(def.getReturns())); methodBuilder.returns(returnType); From 8af1a167486e42c7964a904a70d347882c30b308 Mon Sep 17 00:00:00 2001 From: rzpt <@> Date: Fri, 18 Nov 2022 13:34:53 -0800 Subject: [PATCH 4/4] format --- .../services/dialogue/DefaultStaticFactoryMethodGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java index 8fee22491..8ab38668b 100644 --- a/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java +++ b/conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DefaultStaticFactoryMethodGenerator.java @@ -52,7 +52,6 @@ import com.palantir.dialogue.TypeMarker; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.exceptions.SafeIllegalStateException; -import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.FieldSpec;