From d90d65bad202642c9b450c13c0ab5098b3577312 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 29 Sep 2018 17:36:15 +0200 Subject: [PATCH] Polishing --- .../AbstractApplicationEventMulticaster.java | 6 ++---- .../core/env/StandardEnvironmentTests.java | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java index 73fa12f294..ddcffb1e2e 100644 --- a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java +++ b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java @@ -356,15 +356,13 @@ public abstract class AbstractApplicationEventMulticaster */ private class ListenerRetriever { - public final Set> applicationListeners; + public final Set> applicationListeners = new LinkedHashSet<>(); - public final Set applicationListenerBeans; + public final Set applicationListenerBeans = new LinkedHashSet<>(); private final boolean preFiltered; public ListenerRetriever(boolean preFiltered) { - this.applicationListeners = new LinkedHashSet<>(); - this.applicationListenerBeans = new LinkedHashSet<>(); this.preFiltered = preFiltered; } diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java index 0ffb1fd132..ea125edce0 100644 --- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ import static org.springframework.core.env.AbstractEnvironment.*; * @author Chris Beams * @author Juergen Hoeller */ +@SuppressWarnings("deprecation") public class StandardEnvironmentTests { private static final String ALLOWED_PROPERTY_NAME = "theanswer"; @@ -51,7 +52,8 @@ public class StandardEnvironmentTests { private static final Object NON_STRING_PROPERTY_NAME = new Object(); private static final Object NON_STRING_PROPERTY_VALUE = new Object(); - private ConfigurableEnvironment environment = new StandardEnvironment(); + private final ConfigurableEnvironment environment = new StandardEnvironment(); + @Test public void merge() { @@ -131,12 +133,12 @@ public class StandardEnvironmentTests { @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withNullProfileArray() { - environment.setActiveProfiles((String[])null); + environment.setActiveProfiles((String[]) null); } @Test(expected = IllegalArgumentException.class) public void setActiveProfiles_withNullProfile() { - environment.setActiveProfiles((String)null); + environment.setActiveProfiles((String) null); } @Test(expected = IllegalArgumentException.class) @@ -151,12 +153,12 @@ public class StandardEnvironmentTests { @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withNullProfileArray() { - environment.setDefaultProfiles((String[])null); + environment.setDefaultProfiles((String[]) null); } @Test(expected = IllegalArgumentException.class) public void setDefaultProfiles_withNullProfile() { - environment.setDefaultProfiles((String)null); + environment.setDefaultProfiles((String) null); } @Test(expected = IllegalArgumentException.class) @@ -270,12 +272,12 @@ public class StandardEnvironmentTests { @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withNullArgumentList() { - environment.acceptsProfiles((String[])null); + environment.acceptsProfiles((String[]) null); } @Test(expected = IllegalArgumentException.class) public void acceptsProfiles_withNullArgument() { - environment.acceptsProfiles((String)null); + environment.acceptsProfiles((String) null); } @Test(expected = IllegalArgumentException.class) @@ -283,7 +285,6 @@ public class StandardEnvironmentTests { environment.acceptsProfiles(""); } - @Test public void acceptsProfiles_activeProfileSetProgrammatically() { assertThat(environment.acceptsProfiles("p1", "p2"), is(false)); @@ -488,6 +489,7 @@ public class StandardEnvironmentTests { getModifiableSystemEnvironment().remove(DISALLOWED_PROPERTY_NAME); } + @SuppressWarnings("unchecked") public static Map getModifiableSystemEnvironment() { // for os x / linux