218 missing deprecated annotation for getinvalidoneof method

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/AnyOfFoldValidationGenerator.java

@@ -6,8 +6,7 @@
 import static io.github.muehmar.codegenerator.Generator.constant;
 
 import ch.bluecare.commons.data.NonEmptyList;
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
-import com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator;
+import com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.SettingsFunctions;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator;
@@ -40,9 +39,9 @@ private static Generator<NonEmptyList<JavaObjectPojo>, PojoSettings> annotatedMe
             .content(methodContent())
             .build();
 
-    return JavaDocGenerators.<NonEmptyList<JavaObjectPojo>>deprecatedValidationMethodJavaDoc()
+    return DeprecatedMethodGenerator
+        .<NonEmptyList<JavaObjectPojo>>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(ValidationAnnotationGenerator.validAnnotation())
-        .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
         .append(JacksonAnnotationGenerator.jsonIgnore())
         .append(method);
   }

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/DiscriminatorValidationMethodGenerator.java

@@ -5,8 +5,7 @@
 import static io.github.muehmar.codegenerator.Generator.ofWriterFunction;
 
 import ch.bluecare.commons.data.NonEmptyList;
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
-import com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator;
+import com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.SettingsFunctions;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator;
@@ -41,9 +40,9 @@ public static Generator<JavaObjectPojo, PojoSettings> discriminatorValidationMet
             .build();
 
     final Generator<PojoAndDiscriminator, PojoSettings> completeMethodGen =
-        JavaDocGenerators.<PojoAndDiscriminator>deprecatedValidationMethodJavaDoc()
+        DeprecatedMethodGenerator
+            .<PojoAndDiscriminator>deprecatedJavaDocAndAnnotationForValidationMethod()
             .append(annotation)
-            .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
             .append(JacksonAnnotationGenerator.jsonIgnore())
             .append(method);
 

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/InvalidCompositionDtoGetterGenerator.java

@@ -1,7 +1,7 @@
 package com.github.muehmar.gradle.openapi.generator.java.generator.pojo.composition;
 
-import static com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators.deprecatedValidationMethodJavaDoc;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.pojo.RefsGenerator.ref;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator.deprecatedJavaDocAndAnnotationForValidationMethod;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIgnore;
 import static com.github.muehmar.gradle.openapi.generator.java.model.name.MethodNames.Composition.AnyOf.getAnyOfValidCountMethodName;
 import static com.github.muehmar.gradle.openapi.generator.java.model.name.MethodNames.Composition.CompositionType.ANY_OF;
@@ -53,7 +53,7 @@ private static Generator<JavaObjectPojo, PojoSettings> invalidCompositionDtoGett
             .append(ref(JavaRefs.JAVA_UTIL_HASH_MAP));
 
     return Generator.<JavaObjectPojo, PojoSettings>emptyGen()
-        .append(deprecatedValidationMethodJavaDoc())
+        .append(deprecatedJavaDocAndAnnotationForValidationMethod())
         .append(ValidationAnnotationGenerator.validAnnotation())
         .append(jsonIgnore())
         .append(method)

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/OneOfFoldValidationGenerator.java

@@ -6,8 +6,7 @@
 import static io.github.muehmar.codegenerator.Generator.constant;
 
 import ch.bluecare.commons.data.NonEmptyList;
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
-import com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator;
+import com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.SettingsFunctions;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator;
@@ -40,9 +39,9 @@ private static Generator<NonEmptyList<JavaObjectPojo>, PojoSettings> annotatedMe
             .content(methodContent())
             .build();
 
-    return JavaDocGenerators.<NonEmptyList<JavaObjectPojo>>deprecatedValidationMethodJavaDoc()
+    return DeprecatedMethodGenerator
+        .<NonEmptyList<JavaObjectPojo>>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(ValidationAnnotationGenerator.validAnnotation())
-        .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
         .append(JacksonAnnotationGenerator.jsonIgnore())
         .append(method);
   }

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/ValidCountValidationMethod.java

@@ -7,8 +7,7 @@
 import static com.github.muehmar.gradle.openapi.generator.java.model.name.MethodNames.Composition.isValidAgainstNoSchemaMethodName;
 
 import ch.bluecare.commons.data.NonEmptyList;
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
-import com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator;
+import com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.SettingsFunctions;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator;
@@ -66,9 +65,9 @@ private static Generator<NonEmptyList<JavaObjectPojo>, PojoSettings> isValidAgai
             .doesNotThrow()
             .content(String.format("return %s() == 0;", getValidCountMethodName(type)))
             .build();
-    return JavaDocGenerators.<NonEmptyList<JavaObjectPojo>>deprecatedValidationMethodJavaDoc()
+    return DeprecatedMethodGenerator
+        .<NonEmptyList<JavaObjectPojo>>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(annotation)
-        .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
         .append(JacksonAnnotationGenerator.jsonIgnore())
         .append(method);
   }
@@ -92,9 +91,9 @@ private static Generator<NonEmptyList<JavaObjectPojo>, PojoSettings> isValidAgai
             .doesNotThrow()
             .content(String.format("return %s() > 1;", getValidCountMethodName(ONE_OF)))
             .build();
-    return JavaDocGenerators.<NonEmptyList<JavaObjectPojo>>deprecatedValidationMethodJavaDoc()
+    return DeprecatedMethodGenerator
+        .<NonEmptyList<JavaObjectPojo>>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(annotation)
-        .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
         .append(JacksonAnnotationGenerator.jsonIgnore())
         .append(method)
         .prependNewLine();

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/getter/OptionalNotNullableGetter.java

@@ -1,7 +1,7 @@
 package com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter;
 
 import static com.github.muehmar.gradle.openapi.generator.java.GeneratorUtil.noSettingsGen;
-import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator.deprecatedAnnotationForValidationMethod;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator.deprecatedJavaDocAndAnnotationForValidationMethod;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters.isValidationEnabled;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIgnore;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIncludeNonNull;
@@ -10,7 +10,6 @@
 import static io.github.muehmar.codegenerator.java.JavaDocGenerator.javaDoc;
 import static io.github.muehmar.codegenerator.java.JavaModifier.PUBLIC;
 
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.RefsGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter.GetterGenerator.GeneratorOption;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters;
@@ -49,11 +48,10 @@ private static Generator<JavaPojoMember, PojoSettings> alternateGetter() {
   private static Generator<JavaPojoMember, PojoSettings> rawGetter(GeneratorOption option) {
     return Generator.<JavaPojoMember, PojoSettings>emptyGen()
         .appendNewLine()
-        .append(JavaDocGenerators.deprecatedValidationMethodJavaDoc())
+        .append(deprecatedJavaDocAndAnnotationForValidationMethod())
         .append(jsonProperty())
         .append(jsonIncludeNonNull())
         .append(validationAnnotationsForMember().filter(option.validationFilter()))
-        .append(deprecatedAnnotationForValidationMethod())
         .append(CommonGetter.rawGetterMethod())
         .filter(Filters.<JavaPojoMember>isJacksonJson().or(isValidationEnabled()));
   }

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/getter/OptionalNullableGetter.java

@@ -2,7 +2,7 @@
 
 import static com.github.muehmar.gradle.openapi.generator.java.GeneratorUtil.noSettingsGen;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter.CommonGetter.tristateGetterMethod;
-import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator.deprecatedAnnotationForValidationMethod;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator.deprecatedJavaDocAndAnnotationForValidationMethod;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters.isJacksonJson;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters.isValidationEnabled;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIgnore;
@@ -13,7 +13,6 @@
 import static io.github.muehmar.codegenerator.java.JavaModifier.PRIVATE;
 import static io.github.muehmar.codegenerator.java.JavaModifier.PUBLIC;
 
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.RefsGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter.GetterGenerator.GeneratorOption;
 import com.github.muehmar.gradle.openapi.generator.java.model.member.JavaPojoMember;
@@ -68,9 +67,8 @@ private static Generator<JavaPojoMember, PojoSettings> jacksonSerializerMethod()
   private static Generator<JavaPojoMember, PojoSettings> validationMethod(GeneratorOption option) {
     return Generator.<JavaPojoMember, PojoSettings>emptyGen()
         .appendNewLine()
-        .append(JavaDocGenerators.deprecatedValidationMethodJavaDoc())
+        .append(deprecatedJavaDocAndAnnotationForValidationMethod())
         .append(validationAnnotationsForMember())
-        .append(deprecatedAnnotationForValidationMethod())
         .append(jsonIgnore())
         .append(CommonGetter.rawGetterMethod())
         .filter(isValidationEnabled())

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/getter/RequiredAdditionalPropertiesGetter.java

@@ -1,15 +1,16 @@
 package com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter;
 
-import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator.deprecatedAnnotationForValidationMethod;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIgnore;
-import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.*;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.assertTrue;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.notNullAnnotation;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.validAnnotationForType;
 import static com.github.muehmar.gradle.openapi.generator.java.model.JavaAdditionalProperties.additionalPropertiesName;
 import static io.github.muehmar.codegenerator.Generator.constant;
 import static io.github.muehmar.codegenerator.Generator.newLine;
 import static io.github.muehmar.codegenerator.java.JavaModifier.PUBLIC;
 
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.RefsGenerator;
+import com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.SettingsFunctions;
 import com.github.muehmar.gradle.openapi.generator.java.model.pojo.JavaObjectPojo;
@@ -86,8 +87,8 @@ private static Generator<JavaRequiredAdditionalProperty, PojoSettings> getterCon
 
   private static Generator<JavaRequiredAdditionalProperty, PojoSettings>
       notNullValidationGetterForSpecificType() {
-    return JavaDocGenerators.<JavaRequiredAdditionalProperty>deprecatedValidationMethodJavaDoc()
-        .append(deprecatedAnnotationForValidationMethod())
+    return DeprecatedMethodGenerator
+        .<JavaRequiredAdditionalProperty>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(notNullAnnotation())
         .append(
             MethodGenBuilder.<JavaRequiredAdditionalProperty, PojoSettings>create()
@@ -109,8 +110,8 @@ private static Generator<JavaRequiredAdditionalProperty, PojoSettings> getterCon
 
   private static Generator<JavaRequiredAdditionalProperty, PojoSettings>
       correctTypeValidationGetterForSpecificType() {
-    return JavaDocGenerators.<JavaRequiredAdditionalProperty>deprecatedValidationMethodJavaDoc()
-        .append(deprecatedAnnotationForValidationMethod())
+    return DeprecatedMethodGenerator
+        .<JavaRequiredAdditionalProperty>deprecatedJavaDocAndAnnotationForValidationMethod()
         .append(
             assertTrue(
                 prop ->

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/getter/RequiredNullableGetter.java

@@ -1,15 +1,14 @@
 package com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter;
 
 import static com.github.muehmar.gradle.openapi.generator.java.GeneratorUtil.noSettingsGen;
-import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.AnnotationGenerator.deprecatedAnnotationForValidationMethod;
+import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.DeprecatedMethodGenerator.deprecatedJavaDocAndAnnotationForValidationMethod;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonIgnore;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.jackson.JacksonAnnotationGenerator.jsonProperty;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.assertTrue;
 import static com.github.muehmar.gradle.openapi.generator.java.generator.shared.validation.ValidationAnnotationGenerator.validationAnnotationsForMember;
 import static io.github.muehmar.codegenerator.java.JavaDocGenerator.javaDoc;
 import static io.github.muehmar.codegenerator.java.JavaModifier.PUBLIC;
 
-import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.RefsGenerator;
 import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.getter.GetterGenerator.GeneratorOption;
 import com.github.muehmar.gradle.openapi.generator.java.generator.shared.Filters;
@@ -56,20 +55,18 @@ private static Generator<JavaPojoMember, PojoSettings> nullableGetterMethodWithA
       BiPredicate<JavaPojoMember, PojoSettings> isJacksonJsonOrValidation, GeneratorOption option) {
     return Generator.<JavaPojoMember, PojoSettings>emptyGen()
         .appendNewLine()
-        .append(JavaDocGenerators.deprecatedValidationMethodJavaDoc())
+        .append(deprecatedJavaDocAndAnnotationForValidationMethod())
         .append(validationAnnotationsForMember().filter(option.validationFilter()))
         .append(jsonProperty())
-        .append(deprecatedAnnotationForValidationMethod())
         .append(CommonGetter.rawGetterMethod())
         .filter(isJacksonJsonOrValidation);
   }
 
   private static Generator<JavaPojoMember, PojoSettings> requiredValidationMethodWithAnnotation() {
     return Generator.<JavaPojoMember, PojoSettings>emptyGen()
         .appendNewLine()
-        .append(JavaDocGenerators.deprecatedValidationMethodJavaDoc())
+        .append(deprecatedJavaDocAndAnnotationForValidationMethod())
         .append(assertTrue(f -> String.format("%s is required but it is not present", f.getName())))
-        .append(deprecatedAnnotationForValidationMethod())
         .append(jsonIgnore())
         .append(requiredValidationMethod())
         .filter(Filters.isValidationEnabled());

plugin/src/main/java/com/github/muehmar/gradle/openapi/generator/java/generator/shared/DeprecatedMethodGenerator.java

@@ -0,0 +1,15 @@
+package com.github.muehmar.gradle.openapi.generator.java.generator.shared;
+
+import com.github.muehmar.gradle.openapi.generator.java.generator.pojo.JavaDocGenerators;
+import com.github.muehmar.gradle.openapi.generator.settings.PojoSettings;
+import io.github.muehmar.codegenerator.Generator;
+
+public class DeprecatedMethodGenerator {
+  private DeprecatedMethodGenerator() {}
+
+  public static <A> Generator<A, PojoSettings> deprecatedJavaDocAndAnnotationForValidationMethod() {
+    return JavaDocGenerators.<A>deprecatedValidationMethodJavaDoc()
+        .append(AnnotationGenerator.deprecatedAnnotationForValidationMethod())
+        .filter((a, settings) -> settings.getValidationMethods().isDeprecatedAnnotation());
+  }
+}

plugin/src/test/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/InvalidCompositionDtoGetterGeneratorTest.java

@@ -17,7 +17,9 @@
 import com.github.muehmar.gradle.openapi.generator.java.model.pojo.JavaPojos;
 import com.github.muehmar.gradle.openapi.generator.model.Discriminator;
 import com.github.muehmar.gradle.openapi.generator.model.name.Name;
+import com.github.muehmar.gradle.openapi.generator.settings.JavaModifier;
 import com.github.muehmar.gradle.openapi.generator.settings.PojoSettings;
+import com.github.muehmar.gradle.openapi.generator.settings.ValidationMethods;
 import com.github.muehmar.gradle.openapi.snapshot.SnapshotTest;
 import io.github.muehmar.codegenerator.Generator;
 import io.github.muehmar.codegenerator.writer.Writer;
@@ -43,6 +45,22 @@ void generate_when_oneOfPojo_then_correctOutput() {
     expect.toMatchSnapshot(writerSnapshot(writer));
   }
 
+  @Test
+  @SnapshotName("oneOfPojoWithPublicDeprecatedValidationMethods")
+  void generate_when_oneOfPojoWithPublicDeprecatedValidationMethods_then_correctOutput() {
+    final Generator<JavaObjectPojo, PojoSettings> generator =
+        invalidCompositionDtoGetterGenerator();
+
+    final Writer writer =
+        generator.generate(
+            JavaPojos.oneOfPojo(sampleObjectPojo1(), sampleObjectPojo2()),
+            defaultTestSettings()
+                .withValidationMethods(new ValidationMethods(JavaModifier.PUBLIC, "Raw", true)),
+            javaWriter());
+
+    expect.toMatchSnapshot(writerSnapshot(writer));
+  }
+
   @Test
   @SnapshotName("oneOfPojoWithDiscriminator")
   void generate_when_oneOfPojoWithDiscriminator_then_correctOutput() {

plugin/src/test/java/com/github/muehmar/gradle/openapi/generator/java/generator/pojo/composition/__snapshots__/AnyOfFoldValidationGeneratorTest.snap

@@ -21,8 +21,8 @@ javax.validation.Valid
  * @deprecated This method is intended to be used only by frameworks for validation
  * or serialisation.
  */
-@Valid
 @Deprecated
+@Valid
 @JsonIgnore
 protected List<Object> getAnyOf() {
   if (getAnyOfValidCount() == 0) {