diff --git a/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java b/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java index d8041101..6762b9f3 100644 --- a/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java +++ b/spring-binding/src/main/java/org/springframework/binding/collection/AbstractCachingMapDecorator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2004-2020 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.binding.collection; import java.io.Serializable; diff --git a/spring-binding/src/main/java/org/springframework/binding/convert/converters/StringToCharacter.java b/spring-binding/src/main/java/org/springframework/binding/convert/converters/StringToCharacter.java index db456e04..91a10cc3 100644 --- a/spring-binding/src/main/java/org/springframework/binding/convert/converters/StringToCharacter.java +++ b/spring-binding/src/main/java/org/springframework/binding/convert/converters/StringToCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java index e092e3e7..b407b091 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java index ab438ff0..4ab854ee 100644 --- a/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java +++ b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. @@ -44,13 +44,13 @@ public class DefaultMessageContext implements StateManageableMessageContext { private MessageSource messageSource; @SuppressWarnings("serial") - private Map> sourceMessages = new AbstractCachingMapDecorator>( - new LinkedHashMap<>()) { + private Map> sourceMessages = + new AbstractCachingMapDecorator>(new LinkedHashMap<>()) { - protected List create(Object source) { - return new ArrayList<>(); - } - }; + protected List create(Object source) { + return new ArrayList<>(); + } + }; /** * Creates a new default message context. Defaults to a message source that simply resolves default text and cannot diff --git a/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java b/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java index eabee570..711b4064 100644 --- a/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-faces/src/main/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParser.java b/spring-faces/src/main/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParser.java index 956a160e..e499461e 100644 --- a/spring-faces/src/main/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParser.java +++ b/spring-faces/src/main/java/org/springframework/faces/config/FacesFlowBuilderServicesBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2014 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java index b7b9bb3d..ce572fca 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SelectionTrackingActionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java index 9aaf20ee..fec3fda7 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2015 the original author or authors. + * Copyright 2004-2020 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. @@ -28,6 +28,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.el.ELContext; import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; @@ -38,7 +39,6 @@ import javax.faces.context.PartialViewContextFactory; import javax.faces.lifecycle.Lifecycle; import org.springframework.binding.message.Message; -import org.springframework.binding.message.MessageCriteria; import org.springframework.binding.message.MessageResolver; import org.springframework.binding.message.Severity; import org.springframework.context.MessageSource; @@ -230,8 +230,9 @@ public class FlowFacesContext extends FacesContextWrapper { */ public List getMessageList(final String clientId) { final FacesMessageSource source = new FacesMessageSource(clientId); - Message[] messages = this.context.getMessageContext().getMessagesByCriteria(message -> ObjectUtils.nullSafeEquals(message.getSource(), source) - || ObjectUtils.nullSafeEquals(message.getSource(), clientId)); + Message[] messages = this.context.getMessageContext().getMessagesByCriteria(message -> + ObjectUtils.nullSafeEquals(message.getSource(), source) + || ObjectUtils.nullSafeEquals(message.getSource(), clientId)); return asFacesMessages(messages); } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java index 4f3092b7..ebce848b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java index 488cedbe..9edd54f0 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/ConversationContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2015 the original author or authors. + * Copyright 2004-2020 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. @@ -16,8 +16,6 @@ package org.springframework.webflow.conversation.impl; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java index 9b488f42..f8475008 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java index ae746064..0232bad6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java index 06b17281..8f6aeee5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java index 3be5b1db..3deba2eb 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. @@ -50,9 +50,11 @@ public class FlowVariablePropertyAccessor implements PropertyAccessor { private static Map variables = new HashMap<>(); static { - variables.put("currentUser", () -> RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser()); - variables.put("flowRequestContext", () -> RequestContextHolder.getRequestContext()); - variables.put("resourceBundle", () -> RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext()); + variables.put("currentUser", () -> + RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser()); + variables.put("flowRequestContext", RequestContextHolder::getRequestContext); + variables.put("resourceBundle", () -> + RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext()); } public Class[] getSpecificTargetClasses() { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java index 854750e1..8366a3f4 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2018 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java index 51273526..902635cc 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/security/SecurityFlowExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2015 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java index d8a71ac4..b9820f59 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java index 1f39d16b..8f1b31d1 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2004-2020 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. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java index 67973519..4552f63d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/validation/ValidationHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2012 the original author or authors. + * Copyright 2008-2020 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. diff --git a/spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalAttributeMapTests.java b/spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalAttributeMapTests.java index f5b7d4ca..68cf0988 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalAttributeMapTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/core/collection/LocalAttributeMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. @@ -53,25 +53,25 @@ public class LocalAttributeMapTests { attributeMap.put("collection", new LinkedList<>()); } - @Test + @Test public void testGet() { TestBean bean = (TestBean) attributeMap.get("bean"); assertNotNull(bean); } - @Test + @Test public void testGetNull() { TestBean bean = (TestBean) attributeMap.get("bogus"); assertNull(bean); } - @Test + @Test public void testGetRequiredType() { TestBean bean = attributeMap.get("bean", TestBean.class); assertNotNull(bean); } - @Test + @Test public void testGetWrongType() { try { attributeMap.get("bean", String.class); @@ -81,7 +81,7 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetWithDefaultOption() { TestBean d = new TestBean(); TestBean bean = (TestBean) attributeMap.get("bean", d); @@ -89,20 +89,20 @@ public class LocalAttributeMapTests { assertNotSame(bean, d); } - @Test + @Test public void testGetWithDefault() { TestBean d = new TestBean(); TestBean bean = (TestBean) attributeMap.get("bogus", d); assertSame(bean, d); } - @Test + @Test public void testGetRequired() { TestBean bean = (TestBean) attributeMap.getRequired("bean"); assertNotNull(bean); } - @Test + @Test public void testGetRequiredNotPresent() { try { attributeMap.getRequired("bogus"); @@ -112,13 +112,13 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetRequiredOfType() { TestBean bean = attributeMap.getRequired("bean", TestBean.class); assertNotNull(bean); } - @Test + @Test public void testGetRequiredWrongType() { try { attributeMap.getRequired("bean", String.class); @@ -128,13 +128,13 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetNumber() { BigDecimal bd = attributeMap.getNumber("bigDecimal", BigDecimal.class); assertEquals(new BigDecimal("12345.67"), bd); } - @Test + @Test public void testGetNumberWrongType() { try { attributeMap.getNumber("bigDecimal", Integer.class); @@ -144,7 +144,7 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetNumberWithDefaultOption() { BigDecimal d = new BigDecimal("1"); BigDecimal bd = attributeMap.getNumber("bigDecimal", BigDecimal.class, d); @@ -152,7 +152,7 @@ public class LocalAttributeMapTests { assertNotSame(d, bd); } - @Test + @Test public void testGetNumberWithDefault() { BigDecimal d = new BigDecimal("1"); BigDecimal bd = attributeMap.getNumber("bogus", BigDecimal.class, d); @@ -160,13 +160,13 @@ public class LocalAttributeMapTests { assertSame(d, bd); } - @Test + @Test public void testGetNumberRequired() { BigDecimal bd = attributeMap.getRequiredNumber("bigDecimal", BigDecimal.class); assertEquals(new BigDecimal("12345.67"), bd); } - @Test + @Test public void testGetNumberRequiredNotPresent() { try { attributeMap.getRequiredNumber("bogus", BigDecimal.class); @@ -176,25 +176,25 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetInteger() { Integer i = attributeMap.getInteger("integer"); assertEquals(new Integer(12345), i); } - @Test + @Test public void testGetIntegerNull() { Integer i = attributeMap.getInteger("bogus"); assertNull(i); } - @Test + @Test public void testGetIntegerRequired() { Integer i = attributeMap.getRequiredInteger("integer"); assertEquals(new Integer(12345), i); } - @Test + @Test public void testGetIntegerRequiredNotPresent() { try { attributeMap.getRequiredInteger("bogus"); @@ -204,25 +204,25 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetLong() { Long i = attributeMap.getLong("long"); assertEquals(new Long(12345), i); } - @Test + @Test public void testGetLongNull() { Long i = attributeMap.getLong("bogus"); assertNull(i); } - @Test + @Test public void testGetLongRequired() { Long i = attributeMap.getRequiredLong("long"); assertEquals(new Long(12345), i); } - @Test + @Test public void testGetLongRequiredNotPresent() { try { attributeMap.getRequiredLong("bogus"); @@ -232,25 +232,25 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetString() { String i = attributeMap.getString("string"); assertEquals("A string", i); } - @Test + @Test public void testGetStringNull() { String i = attributeMap.getString("bogus"); assertNull(i); } - @Test + @Test public void testGetStringRequired() { String i = attributeMap.getRequiredString("string"); assertEquals("A string", i); } - @Test + @Test public void testGetStringRequiredNotPresent() { try { attributeMap.getRequiredString("bogus"); @@ -260,25 +260,25 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetBoolean() { Boolean i = attributeMap.getBoolean("boolean"); assertEquals(Boolean.TRUE, i); } - @Test + @Test public void testGetBooleanNull() { Boolean i = attributeMap.getBoolean("bogus"); assertNull(i); } - @Test + @Test public void testGetBooleanRequired() { Boolean i = attributeMap.getRequiredBoolean("boolean"); assertEquals(Boolean.TRUE, i); } - @Test + @Test public void testGetBooleanRequiredNotPresent() { try { attributeMap.getRequiredBoolean("bogus"); @@ -288,25 +288,25 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetArray() { String[] i = attributeMap.getArray("stringArray", String[].class); assertEquals(3, i.length); } - @Test + @Test public void testGetArrayNull() { String[] i = attributeMap.getArray("A bogus array", String[].class); assertNull(i); } - @Test + @Test public void testGetArrayRequired() { String[] i = attributeMap.getRequiredArray("stringArray", String[].class); assertEquals(3, i.length); } - @Test + @Test public void testGetArrayRequiredNotPresent() { try { attributeMap.getRequiredArray("A bogus array", String[].class); @@ -317,7 +317,7 @@ public class LocalAttributeMapTests { } @SuppressWarnings("unchecked") - @Test + @Test public void testGetCollection() { List i = attributeMap.getCollection("collection", List.class); assertTrue(i instanceof LinkedList); @@ -325,20 +325,20 @@ public class LocalAttributeMapTests { } @SuppressWarnings("unchecked") - @Test + @Test public void testGetCollectionNull() { List i = attributeMap.getCollection("bogus", List.class); assertNull(i); } @SuppressWarnings("unchecked") - @Test + @Test public void testGetCollectionRequired() { List i = attributeMap.getRequiredCollection("collection", List.class); assertEquals(0, i.size()); } - @Test + @Test public void testGetCollectionRequiredNotPresent() { try { attributeMap.getRequiredCollection("A bogus collection"); @@ -348,13 +348,13 @@ public class LocalAttributeMapTests { } } - @Test + @Test public void testGetMap() { Map map = attributeMap.asMap(); assertEquals(10, map.size()); } - @Test + @Test public void testUnion() { LocalAttributeMap one = new LocalAttributeMap<>(); one.put("foo", "bar"); @@ -371,7 +371,7 @@ public class LocalAttributeMapTests { assertEquals("boo", three.get("bar")); } - @Test + @Test public void testEquality() { LocalAttributeMap map = new LocalAttributeMap<>(); map.put("foo", "bar"); @@ -382,7 +382,7 @@ public class LocalAttributeMapTests { assertEquals(map, map2); } - @Test + @Test public void testExtract() { assertEquals("A string", attributeMap.extract("string")); assertFalse(attributeMap.contains("string")); diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java index 2fbc7a46..102637e3 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolverTests.java @@ -1,19 +1,14 @@ package org.springframework.webflow.expression.el; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - import java.security.Principal; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.el.ELResolver; import javax.el.PropertyNotWritableException; import org.junit.jupiter.api.Test; + import org.springframework.binding.message.MessageContext; import org.springframework.util.ClassUtils; import org.springframework.webflow.context.ExternalContext; @@ -27,6 +22,11 @@ import org.springframework.webflow.test.MockFlowExecutionContext; import org.springframework.webflow.test.MockFlowExecutionKey; import org.springframework.webflow.test.MockRequestContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class ImplicitFlowVariableELResolverTests extends FlowDependentELResolverTestCase { private static final List vars = new ArrayList<>(); diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java index de778cc4..235e060d 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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. @@ -15,20 +15,19 @@ */ package org.springframework.webflow.expression.spel; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.expression.TypedValue; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.webflow.engine.ViewState; import org.springframework.webflow.execution.RequestContext; -import org.springframework.webflow.execution.View; -import org.springframework.webflow.execution.ViewFactory; import org.springframework.webflow.test.MockFlowSession; import org.springframework.webflow.test.MockRequestContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + public class ScopeSearchingPropertyAccessorTests { private ScopeSearchingPropertyAccessor accessor = new ScopeSearchingPropertyAccessor(); diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.java b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.java index d1f7152d..70bce37c 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2020 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.