Issue #569: excludePropertyAnnotations not respected when using gson (#570)

* Issue #569: excludePropertyAnnotations not respected when using gson

The excludePropertyAnnotations property is not respected when using gson
as JsonLibrary.

* Configured an exclusion strategy on the GsonParser to fix the issue
* Adjusted the IncludeExcludePropertyTest to reveal the issue and check
the fix.

* Fixed checkstyle warnings

Author: robin-xyzt-ai

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/GsonParser.java

@@ -1,5 +1,7 @@
 package cz.habarta.typescript.generator.parser;
 
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
@@ -50,6 +52,17 @@ public GsonParser(Settings settings, TypeProcessor commonTypeProcessor,
             : Modifier.STATIC | Modifier.TRANSIENT;
         this.gson = new GsonBuilder()
             .excludeFieldsWithModifiers(modifiers)
+            .setExclusionStrategies(new ExclusionStrategy() {
+                @Override
+                public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+                    return !isAnnotatedPropertyIncluded(fieldAttributes::getAnnotation, fieldAttributes.getDeclaringClass().getName() + "." + fieldAttributes.getName());
+                }
+
+                @Override
+                public boolean shouldSkipClass(Class<?> aClass) {
+                    return false;
+                }
+            })
             .create();
     }
 

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/IncludeExcludePropertyTest.java

@@ -4,16 +4,37 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 
 @SuppressWarnings("unused")
+@RunWith(Parameterized.class)
 public class IncludeExcludePropertyTest {
 
+    @Parameterized.Parameters(name = "{index} - {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.stream(JsonLibrary.values())
+                .filter(library -> library != JsonLibrary.jackson1 && library != JsonLibrary.jsonb)
+                .map(library -> new Object[]{library})
+                .collect(Collectors.toList());
+    }
+
+    private final JsonLibrary library;
+
+    public IncludeExcludePropertyTest(JsonLibrary library) {
+        this.library = library;
+    }
+
+
     @Test
     public void testInclude() {
         final Settings settings = TestUtils.settings();
+        settings.jsonLibrary = library;
         settings.includePropertyAnnotations = Arrays.asList(MyInclude.class);
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(ClassWithAnnotatedProperties.class));
         Assert.assertTrue(!output.contains("property1"));
@@ -25,6 +46,7 @@ public void testInclude() {
     @Test
     public void testExclude() {
         final Settings settings = TestUtils.settings();
+        settings.jsonLibrary = library;
         settings.excludePropertyAnnotations = Arrays.asList(MyExclude.class);
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(ClassWithAnnotatedProperties.class));
         Assert.assertTrue(output.contains("property1"));
@@ -36,6 +58,8 @@ public void testExclude() {
     @Test
     public void testBoth() {
         final Settings settings = TestUtils.settings();
+        settings.jsonLibrary = library;
+
         settings.includePropertyAnnotations = Arrays.asList(MyInclude.class);
         settings.excludePropertyAnnotations = Arrays.asList(MyExclude.class);
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(ClassWithAnnotatedProperties.class));