Add null-checks to AnnotationSensitivePropertyNamingStrategy (#3515)

    Refs FasterXML/jackson-datatypes-collections#79
    Fixes #3514

Author: Luca Di Grazia

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-core/src/main/java/io/dropwizard/server/AbstractServerFactory.java

@@ -699,7 +699,6 @@ protected Handler buildGzipHandler(Handler handler) {
         return gzip.isEnabled() ? gzip.build(handler) : handler;
     }
 
-    @SuppressWarnings("Slf4jFormatShouldBeConst")
     protected void printBanner(String name) {
         String msg = "Starting " + name;
         final URL resource = Thread.currentThread().getContextClassLoader().getResource("banner.txt");
@@ -709,7 +708,7 @@ protected void printBanner(String name) {
                  final BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
                 final String banner = bufferedReader
                         .lines()
-                        .collect(Collectors.joining(System.lineSeparator()));
+                        .collect(Collectors.joining(String.format("%n")));
                 msg = String.format("Starting %s%n%s", name, banner);
             } catch (IllegalArgumentException | IOException ignored) {
             }

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-jackson/src/main/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategy.java

@@ -1,6 +1,5 @@
 package io.dropwizard.jackson;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
@@ -10,13 +9,18 @@
 /**
  * A {@link PropertyNamingStrategy} implementation which, if the declaring class of a property is
  * annotated with {@link JsonSnakeCase}, uses a
- * {@link com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy}, and uses
+ * {@link com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy}, and uses
  * the default {@link PropertyNamingStrategy} otherwise.
  */
 public class AnnotationSensitivePropertyNamingStrategy extends PropertyNamingStrategy {
     private static final long serialVersionUID = -1372862028366311230L;
 
-    private final PropertyNamingStrategy snakeCase = new PropertyNamingStrategies.SnakeCaseStrategy();
+    private final SnakeCaseStrategy snakeCase;
+
+    public AnnotationSensitivePropertyNamingStrategy() {
+        super();
+        this.snakeCase = new SnakeCaseStrategy();
+    }
 
     @Override
     public String nameForConstructorParameter(MapperConfig<?> config,

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-jackson/src/test/java/io/dropwizard/jackson/AnnotationSensitivePropertyNamingStrategyTest.java

@@ -3,14 +3,17 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.cfg.MapperConfig;
+import com.fasterxml.jackson.datatype.guava.deser.util.RangeHelper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import javax.annotation.Nullable;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
-public class AnnotationSensitivePropertyNamingStrategyTest {
+class AnnotationSensitivePropertyNamingStrategyTest {
     public static class RegularExample {
         @JsonProperty
         @Nullable
@@ -42,31 +45,69 @@ public SnakeCaseExample(String firstName) {
     private final ObjectMapper mapper = new ObjectMapper();
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() {
         mapper.setPropertyNamingStrategy(strategy);
     }
 
     @Test
-    public void serializesRegularProperties() throws Exception {
+    void serializesRegularProperties() throws Exception {
         assertThat(mapper.writeValueAsString(new RegularExample("woo")))
                 .isEqualTo("{\"firstName\":\"woo\"}");
     }
 
     @Test
-    public void serializesSnakeCaseProperties() throws Exception {
+    void serializesSnakeCaseProperties() throws Exception {
         assertThat(mapper.writeValueAsString(new SnakeCaseExample("woo")))
                 .isEqualTo("{\"first_name\":\"woo\"}");
     }
 
     @Test
-    public void deserializesRegularProperties() throws Exception {
+    void deserializesRegularProperties() throws Exception {
         assertThat(mapper.readValue("{\"firstName\":\"woo\"}", RegularExample.class).firstName)
                 .isEqualTo("woo");
     }
 
     @Test
-    public void deserializesSnakeCaseProperties() throws Exception {
+    void deserializesSnakeCaseProperties() throws Exception {
         assertThat(mapper.readValue("{\"first_name\":\"woo\"}", SnakeCaseExample.class).firstName)
                 .isEqualTo("woo");
     }
+
+    @Test
+    void nameForConstructorParameterWorksWithNullField() {
+        final MapperConfig<?> mapperConfig = mock(MapperConfig.class);
+        final String name = strategy.nameForConstructorParameter(mapperConfig, null, "defaultName");
+        assertThat(name).isEqualTo("defaultName");
+    }
+
+    @Test
+    void nameForFieldWorksWithNullField() {
+        final MapperConfig<?> mapperConfig = mock(MapperConfig.class);
+        final String name = strategy.nameForField(mapperConfig, null, "defaultName");
+        assertThat(name).isEqualTo("defaultName");
+    }
+
+    @Test
+    void nameForGetterMethodWorksWithNullField() {
+        final MapperConfig<?> mapperConfig = mock(MapperConfig.class);
+        final String name = strategy.nameForGetterMethod(mapperConfig, null, "defaultName");
+        assertThat(name).isEqualTo("defaultName");
+    }
+
+    @Test
+    void nameForSetterMethodWorksWithNullField() {
+        final MapperConfig<?> mapperConfig = mock(MapperConfig.class);
+        final String name = strategy.nameForSetterMethod(mapperConfig, null, "defaultName");
+        assertThat(name).isEqualTo("defaultName");
+    }
+
+    @Test
+    // https://github.com/dropwizard/dropwizard/issues/3514
+    void usingRangeHelperDoesNotThrowNullPointerException() {
+        final RangeHelper.RangeProperties standardNames = RangeHelper.standardNames();
+        assertThat(standardNames.lowerBoundType).isNotBlank();
+        assertThat(standardNames.lowerEndpoint).isNotBlank();
+        assertThat(standardNames.upperBoundType).isNotBlank();
+        assertThat(standardNames.upperEndpoint).isNotBlank();
+    }
 }