Update release notes wrt #308

Author: cowtowncoder

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvMapper.java

@@ -490,15 +490,18 @@ protected void _addSchemaProperties(CsvSchema.Builder builder, AnnotationIntrosp
         }
 
         BeanDescription beanDesc = getSerializationConfig().introspect(pojoType);
+        final boolean includeByDefault = isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION);
         for (BeanPropertyDefinition prop : beanDesc.findProperties()) {
             if (view != null) {
                 Class<?>[] views = prop.findViews();
                 if (views == null) {
                     views = beanDesc.findDefaultViews();
                 }
-                if (!ViewMatcher.construct(views).isVisibleForView(view)
-                  && !(views == null && this.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION))
-                ) {
+                // If property defines no Views AND non-view-enabled included by default,
+                // should include
+                if ((views == null) && includeByDefault) {
+                    ;
+                } else if (!ViewMatcher.construct(views).isVisibleForView(view)) {
                     continue;
                 }
             }

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/schema/SchemaDefaultView308Test.java

@@ -9,10 +9,8 @@
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;
 import com.fasterxml.jackson.dataformat.csv.ModuleTestBase;
 
-
 public class SchemaDefaultView308Test extends ModuleTestBase
 {
-
     interface BaseView {}
     @JsonView(BaseView.class)
     interface BaseViewMixIn {}
@@ -25,8 +23,7 @@ interface OtherView {}
     @JsonView(OtherView.class)
     interface OtherViewMixIn {}
 
-
-    class ViewTestPojo
+    static class ViewTestPojo
     {
         @JsonProperty
         boolean flag;
@@ -49,10 +46,8 @@ class ViewTestPojo
         }
     }
 
-
     private final ViewTestPojo POJO = new ViewTestPojo(true, '!', 1234, "dummy");
 
-
     private CsvMapper _createMapper(boolean inclusion, Class<?> defaultViewMixin)
     {
         final CsvMapper.Builder builder = CsvMapper.builder().configure(MapperFeature.DEFAULT_VIEW_INCLUSION, inclusion);
@@ -62,7 +57,6 @@ private CsvMapper _createMapper(boolean inclusion, Class<?> defaultViewMixin)
         return builder.build();
     }
 
-
     private void _verifyExpected(final CsvMapper csvMapper, final Class<?> view, final String... expectedNames)
     {
         final Set<String> actualCsvNames = new HashSet<>();
@@ -75,7 +69,6 @@ private void _verifyExpected(final CsvMapper csvMapper, final Class<?> view, fin
         );
     }
 
-
     public void testSchemaWithImplicitDefaultViewAndDefaultViewInclusionDisabled()
     {
         CsvMapper csvMapper = _createMapper(false, null);
@@ -85,7 +78,6 @@ public void testSchemaWithImplicitDefaultViewAndDefaultViewInclusionDisabled()
         _verifyExpected(csvMapper, OtherView.class, "text");
     }
 
-
     public void testSchemaWithDefaultBaseViewAndDefaultViewInclusionDisabled()
     {
         CsvMapper csvMapper = _createMapper(false, BaseViewMixIn.class);
@@ -95,7 +87,6 @@ public void testSchemaWithDefaultBaseViewAndDefaultViewInclusionDisabled()
         _verifyExpected(csvMapper, OtherView.class, "text");
     }
 
-
     public void testSchemaWithDefaultExtendedViewAndDefaultViewInclusionDisabled()
     {
         CsvMapper csvMapper = _createMapper(false, ExtendedViewMixIn.class);
@@ -105,7 +96,6 @@ public void testSchemaWithDefaultExtendedViewAndDefaultViewInclusionDisabled()
         _verifyExpected(csvMapper, OtherView.class, "text");
     }
 
-
     public void testSchemaWithDefaultOtherViewAndDefaultViewInclusionDisabled()
     {
         CsvMapper csvMapper = _createMapper(false, OtherViewMixIn.class);
@@ -115,7 +105,6 @@ public void testSchemaWithDefaultOtherViewAndDefaultViewInclusionDisabled()
         _verifyExpected(csvMapper, OtherView.class, "flag", "text");
     }
 
-
     public void testSchemaWithImplicitDefaultViewAndDefaultViewInclusionEnabled()
     {
         CsvMapper csvMapper = _createMapper(true, null);
@@ -125,7 +114,6 @@ public void testSchemaWithImplicitDefaultViewAndDefaultViewInclusionEnabled()
         _verifyExpected(csvMapper, OtherView.class, "flag", "text");
     }
 
-
     public void testSchemaWithDefaultBaseViewAndDefaultViewInclusionEnabled()
     {
         CsvMapper csvMapper = _createMapper(true, BaseViewMixIn.class);
@@ -135,7 +123,6 @@ public void testSchemaWithDefaultBaseViewAndDefaultViewInclusionEnabled()
         _verifyExpected(csvMapper, OtherView.class, "text");
     }
 
-
     public void testSchemaWithDefaultExtendedViewAndDefaultViewInclusionEnabled()
     {
         CsvMapper csvMapper = _createMapper(true, ExtendedViewMixIn.class);
@@ -145,7 +132,6 @@ public void testSchemaWithDefaultExtendedViewAndDefaultViewInclusionEnabled()
         _verifyExpected(csvMapper, OtherView.class, "text");
     }
 
-
     public void testSchemaWithDefaultOtherViewAndDefaultViewInclusionEnabled()
     {
         CsvMapper csvMapper = _createMapper(true, OtherViewMixIn.class);

release-notes/CREDITS-2.x

@@ -193,6 +193,8 @@ Falk Hanisch (mrpiggi@github)
 #288: Caching conflict when creating CSV schemas with different views
   for the same POJO
  (2.13.1)
+#308: (csv) `CsvMapper.typedSchemaForWithView()` with `DEFAULT_VIEW_INCLUSION`
+ (2.13.2)
 
 Esteban Ginez (eginez@github)
 #306: (yaml) Error when generating/serializing keys with multilines and colon

release-notes/VERSION-2.x

@@ -24,6 +24,8 @@ No changes since 2.13
  (suggested by PJ Fanning)
 #306: (yaml) Error when generating/serializing keys with multilines and colon
  (reported by Esteban G)
+#308: (csv) `CsvMapper.typedSchemaForWithView()` with `DEFAULT_VIEW_INCLUSION`
+ (contributed by Falk H)
 
 2.13.1 (19-Dec-2021)