diff --git a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java
index c634d51a06..3b915e6332 100644
--- a/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java
+++ b/spring-aop/src/main/java/org/aopalliance/aop/AspectException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -20,7 +20,7 @@ package org.aopalliance.aop;
* Superclass for all AOP infrastructure exceptions.
* Unchecked, as such exceptions are fatal and end user
* code shouldn't be forced to catch them.
- *
+ *
* @author Rod Johnson
* @author Bob Lee
* @author Juergen Hoeller
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
index a453ac32e3..cfffeed27c 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -30,12 +30,12 @@ import java.lang.reflect.Constructor;
*/
public interface ConstructorInvocation extends Invocation {
- /**
- * Get the constructor being called.
- * This method is a friendly implementation of the
- * {@link Joinpoint#getStaticPart()} method (same result).
- * @return the constructor being called
- */
- Constructor getConstructor();
+ /**
+ * Get the constructor being called.
+ *
This method is a friendly implementation of the
+ * {@link Joinpoint#getStaticPart()} method (same result).
+ * @return the constructor being called
+ */
+ Constructor getConstructor();
}
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Interceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/Interceptor.java
index eef409a74b..9f56db9404 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/Interceptor.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/Interceptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -24,7 +24,7 @@ import org.aopalliance.aop.Advice;
*
A generic interceptor can intercept runtime events that occur
* within a base program. Those events are materialized by (reified
* in) joinpoints. Runtime joinpoints can be invocations, field
- * access, exceptions...
+ * access, exceptions...
*
*
This interface is not used directly. Use the sub-interfaces
* to intercept specific events. For instance, the following class
@@ -32,7 +32,7 @@ import org.aopalliance.aop.Advice;
* debugger:
*
*
- * class DebuggingInterceptor implements MethodInterceptor,
+ * class DebuggingInterceptor implements MethodInterceptor,
* ConstructorInterceptor, FieldInterceptor {
*
* Object invoke(MethodInvocation i) throws Throwable {
@@ -44,7 +44,7 @@ import org.aopalliance.aop.Advice;
* debug(i.getConstructor(), i.getThis(), i.getArgs());
* return i.proceed();
* }
- *
+ *
* Object get(FieldAccess fa) throws Throwable {
* debug(fa.getField(), fa.getThis(), null);
* return fa.proceed();
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
index 8239b0e63b..006517d342 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -41,7 +41,7 @@ package org.aopalliance.intercept;
*/
@FunctionalInterface
public interface MethodInterceptor extends Interceptor {
-
+
/**
* Implement this method to perform extra treatments before and
* after the invocation. Polite implementations would certainly
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
index 6e9bb0563a..329722b5d6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
@@ -66,7 +66,7 @@ public abstract class AspectJProxyUtils {
return (advisor instanceof InstantiationModelAwarePointcutAdvisor ||
advisor.getAdvice() instanceof AbstractAspectJAdvice ||
(advisor instanceof PointcutAdvisor &&
- ((PointcutAdvisor) advisor).getPointcut() instanceof AspectJExpressionPointcut));
+ ((PointcutAdvisor) advisor).getPointcut() instanceof AspectJExpressionPointcut));
}
}
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
index 03034f48fb..e812e73abf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -47,7 +47,7 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
public AdvisorComponentDefinition(String advisorBeanName, BeanDefinition advisorDefinition) {
- this(advisorBeanName, advisorDefinition, null);
+ this(advisorBeanName, advisorDefinition, null);
}
public AdvisorComponentDefinition(
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
index b6ad61c482..d675d9dc43 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
@@ -113,8 +113,8 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
for (Class ifc : this.interfaces) {
if (this.advice instanceof DynamicIntroductionAdvice &&
!((DynamicIntroductionAdvice) this.advice).implementsInterface(ifc)) {
- throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " +
- "does not implement interface [" + ifc.getName() + "] specified for introduction");
+ throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " +
+ "does not implement interface [" + ifc.getName() + "] specified for introduction");
}
}
}
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
index 487319d6b8..77670f3811 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
@@ -69,9 +69,9 @@ public class TypeMismatchException extends PropertyAccessException {
"Failed to convert property value of type '" +
ClassUtils.getDescriptiveType(propertyChangeEvent.getNewValue()) + "'" +
(requiredType != null ?
- " to required type '" + ClassUtils.getQualifiedName(requiredType) + "'" : "") +
+ " to required type '" + ClassUtils.getQualifiedName(requiredType) + "'" : "") +
(propertyChangeEvent.getPropertyName() != null ?
- " for property '" + propertyChangeEvent.getPropertyName() + "'" : ""),
+ " for property '" + propertyChangeEvent.getPropertyName() + "'" : ""),
cause);
this.propertyName = propertyChangeEvent.getPropertyName();
this.value = propertyChangeEvent.getNewValue();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
index e34f27741f..8954bdedb1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -96,7 +96,7 @@ public class AnnotatedGenericBeanDefinition extends GenericBeanDefinition implem
@Override
public final AnnotationMetadata getMetadata() {
- return this.metadata;
+ return this.metadata;
}
@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
index 7e1adbacdd..dc7612dd61 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -58,15 +58,15 @@ abstract class AutowireUtils {
*/
public static void sortConstructors(Constructor[] constructors) {
Arrays.sort(constructors, (c1, c2) -> {
- boolean p1 = Modifier.isPublic(c1.getModifiers());
- boolean p2 = Modifier.isPublic(c2.getModifiers());
- if (p1 != p2) {
- return (p1 ? -1 : 1);
- }
- int c1pl = c1.getParameterCount();
- int c2pl = c2.getParameterCount();
- return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
- });
+ boolean p1 = Modifier.isPublic(c1.getModifiers());
+ boolean p2 = Modifier.isPublic(c2.getModifiers());
+ if (p1 != p2) {
+ return (p1 ? -1 : 1);
+ }
+ int c1pl = c1.getParameterCount();
+ int c2pl = c2.getParameterCount();
+ return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
+ });
}
/**
@@ -78,15 +78,15 @@ abstract class AutowireUtils {
*/
public static void sortFactoryMethods(Method[] factoryMethods) {
Arrays.sort(factoryMethods, (fm1, fm2) -> {
- boolean p1 = Modifier.isPublic(fm1.getModifiers());
- boolean p2 = Modifier.isPublic(fm2.getModifiers());
- if (p1 != p2) {
- return (p1 ? -1 : 1);
- }
- int c1pl = fm1.getParameterCount();
- int c2pl = fm2.getParameterCount();
- return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
- });
+ boolean p1 = Modifier.isPublic(fm1.getModifiers());
+ boolean p2 = Modifier.isPublic(fm2.getModifiers());
+ if (p1 != p2) {
+ return (p1 ? -1 : 1);
+ }
+ int c1pl = fm1.getParameterCount();
+ int c2pl = fm2.getParameterCount();
+ return (c1pl < c2pl ? 1 : (c1pl > c2pl ? -1 : 0));
+ });
}
/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
index 42a3578868..4ad0272c64 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
@@ -78,7 +78,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
public void setBeanFactory(BeanFactory beanFactory) {
if (!(beanFactory instanceof ConfigurableListableBeanFactory)) {
throw new IllegalArgumentException(
- "Bean configurer aspect needs to run in a ConfigurableListableBeanFactory: " + beanFactory);
+ "Bean configurer aspect needs to run in a ConfigurableListableBeanFactory: " + beanFactory);
}
this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
if (this.beanWiringInfoResolver == null) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
index a42e5f725c..4e86574e1d 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
@@ -190,7 +190,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
private DataSource nonTransactionalDataSource;
@Nullable
- private Map schedulerContextMap;
+ private Map schedulerContextMap;
@Nullable
private ApplicationContext applicationContext;
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
index 2196c0a889..76ceef1d74 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -122,7 +122,7 @@ public class GenericGroovyApplicationContext extends GenericApplicationContext i
private final BeanWrapper contextWrapper = new BeanWrapperImpl(this);
- private MetaClass metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(getClass());
+ private MetaClass metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(getClass());
/**
@@ -229,7 +229,7 @@ public class GenericGroovyApplicationContext extends GenericApplicationContext i
this.metaClass = metaClass;
}
- public MetaClass getMetaClass() {
+ public MetaClass getMetaClass() {
return this.metaClass;
}
@@ -247,7 +247,7 @@ public class GenericGroovyApplicationContext extends GenericApplicationContext i
}
@Nullable
- public Object getProperty(String property) {
+ public Object getProperty(String property) {
if (containsBean(property)) {
return getBean(property);
}
diff --git a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java
index e40dee6a4c..9b067ca1e1 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java
@@ -85,7 +85,7 @@ public final class CharSequenceEncoder extends AbstractEncoder {
charset = mimeType.getCharset();
}
else {
- charset = DEFAULT_CHARSET;
+ charset = DEFAULT_CHARSET;
}
return charset;
}
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
index 398a738dfb..d818706734 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -88,7 +88,7 @@ public abstract class AbstractTypeHierarchyTraversingFilter implements TypeFilte
logger.debug("Could not read super class [" + metadata.getSuperClassName() +
"] of type-filtered class [" + metadata.getClassName() + "]");
}
- }
+ }
}
}
diff --git a/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java b/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java
index 0f1c53121d..7eb23c0840 100644
--- a/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java
+++ b/spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java
@@ -199,7 +199,7 @@ public class ExponentialBackOff implements BackOff {
return maxInterval;
}
else if (this.currentInterval < 0) {
- long initialInterval = getInitialInterval();
+ long initialInterval = getInitialInterval();
this.currentInterval = (initialInterval < maxInterval
? initialInterval : maxInterval);
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
index 71c6408390..bdcd774a48 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -27,13 +27,13 @@ import org.springframework.expression.spel.SpelMessage;
/**
* Represents a bean reference to a type, for example @foo or @'foo.bar' .
* For a FactoryBean the syntax &foo can be used to access the factory itself.
- *
+ *
* @author Andy Clement
*/
public class BeanReference extends SpelNodeImpl {
private static final String FACTORY_BEAN_PREFIX = "&";
-
+
private final String beanName;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
index e7448f31ff..260a8792c2 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BooleanLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -42,16 +42,16 @@ public class BooleanLiteral extends Literal {
public BooleanTypedValue getLiteralValue() {
return this.value;
}
-
+
@Override
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
if (this.value == BooleanTypedValue.TRUE) {
- mv.visitLdcInsn(1);
+ mv.visitLdcInsn(1);
}
else {
mv.visitLdcInsn(0);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index ad147aa683..d85b6e79ee 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -161,7 +161,7 @@ public class ConstructorReference extends SpelNodeImpl {
if (executorToUse instanceof ReflectiveConstructorExecutor) {
this.exitTypeDescriptor = CodeFlow.toDescriptor(
((ReflectiveConstructorExecutor) executorToUse).getConstructor().getDeclaringClass());
-
+
}
return executorToUse.execute(state.getEvaluationContext(), arguments);
}
@@ -422,10 +422,10 @@ public class ConstructorReference extends SpelNodeImpl {
private boolean hasInitializer() {
return (getChildCount() > 1);
}
-
+
@Override
public boolean isCompilable() {
- if (!(this.cachedExecutor instanceof ReflectiveConstructorExecutor) ||
+ if (!(this.cachedExecutor instanceof ReflectiveConstructorExecutor) ||
this.exitTypeDescriptor == null) {
return false;
}
@@ -446,7 +446,7 @@ public class ConstructorReference extends SpelNodeImpl {
return (Modifier.isPublic(constructor.getModifiers()) &&
Modifier.isPublic(constructor.getDeclaringClass().getModifiers()));
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
ReflectiveConstructorExecutor executor = ((ReflectiveConstructorExecutor) this.cachedExecutor);
@@ -460,7 +460,7 @@ public class ConstructorReference extends SpelNodeImpl {
// children[0] is the type of the constructor, don't want to include that in argument processing
SpelNodeImpl[] arguments = new SpelNodeImpl[this.children.length - 1];
System.arraycopy(this.children, 1, arguments, 0, this.children.length - 1);
- generateCodeForArguments(mv, cf, constructor, arguments);
+ generateCodeForArguments(mv, cf, constructor, arguments);
mv.visitMethodInsn(INVOKESPECIAL, classDesc, "", CodeFlow.createSignatureDescriptor(constructor), false);
cf.pushDescriptor(this.exitTypeDescriptor);
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FloatLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FloatLiteral.java
index e2c652a2dd..33293da485 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FloatLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FloatLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -48,7 +48,7 @@ public class FloatLiteral extends Literal {
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
mv.visitLdcInsn(this.value.getValue());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
index c6dfb2c9b3..6ed70b5bf4 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
@@ -163,7 +163,7 @@ public class FunctionReference extends SpelNodeImpl {
}
return arguments;
}
-
+
@Override
public boolean isCompilable() {
Method method = this.method;
@@ -182,8 +182,8 @@ public class FunctionReference extends SpelNodeImpl {
}
return true;
}
-
- @Override
+
+ @Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
Method method = this.method;
Assert.state(method != null, "No method handle");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
index 64a19263aa..31023e6f3c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
@@ -190,7 +190,7 @@ public class Indexer extends SpelNodeImpl {
throw new SpelEvaluationException(
getStartPosition(), SpelMessage.INDEXING_NOT_SUPPORTED_FOR_TYPE, targetDescriptor);
}
-
+
@Override
public boolean isCompilable() {
if (this.indexedType == IndexedType.ARRAY) {
@@ -210,7 +210,7 @@ public class Indexer extends SpelNodeImpl {
}
return false;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
String descriptor = cf.lastDescriptor();
@@ -249,7 +249,7 @@ public class Indexer extends SpelNodeImpl {
mv.visitTypeInsn(CHECKCAST, "[C");
insn = CALOAD;
}
- else {
+ else {
mv.visitTypeInsn(CHECKCAST, "["+ this.exitTypeDescriptor +
(CodeFlow.isPrimitiveArray(this.exitTypeDescriptor) ? "" : ";"));
//depthPlusOne(exitTypeDescriptor)+"Ljava/lang/Object;");
@@ -286,7 +286,7 @@ public class Indexer extends SpelNodeImpl {
}
mv.visitMethodInsn(
INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
- }
+ }
else if (this.indexedType == IndexedType.OBJECT) {
ReflectivePropertyAccessor.OptimalPropertyAccessor accessor =
@@ -313,7 +313,7 @@ public class Indexer extends SpelNodeImpl {
mv.visitFieldInsn((isStatic ? GETSTATIC : GETFIELD), classDesc, member.getName(),
CodeFlow.toJvmDescriptor(((Field) member).getType()));
}
- }
+ }
cf.pushDescriptor(this.exitTypeDescriptor);
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
index c0d5a6f4dd..df4b3b1a27 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
@@ -128,12 +128,12 @@ public class InlineList extends SpelNodeImpl {
Assert.state(this.constant != null, "No constant");
return (List) this.constant.getValue();
}
-
+
@Override
public boolean isCompilable() {
return isConstant();
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow codeflow) {
final String constantFieldName = "inlineList$" + codeflow.nextFieldId();
@@ -144,11 +144,11 @@ public class InlineList extends SpelNodeImpl {
codeflow.registerNewClinit((mVisitor, cflow) ->
generateClinitCode(className, constantFieldName, mVisitor, cflow, false));
-
+
mv.visitFieldInsn(GETSTATIC, className, constantFieldName, "Ljava/util/List;");
codeflow.pushDescriptor("Ljava/util/List");
}
-
+
void generateClinitCode(String clazzname, String constantFieldName, MethodVisitor mv, CodeFlow codeflow, boolean nested) {
mv.visitTypeInsn(NEW, "java/util/ArrayList");
mv.visitInsn(DUP);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
index 3ebf755fb9..b29d124930 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -70,7 +70,7 @@ public class InlineMap extends SpelNodeImpl {
break;
}
}
- else if (!((c%2)==0 && (child instanceof PropertyOrFieldReference))) {
+ else if (!((c%2)==0 && (child instanceof PropertyOrFieldReference))) {
isConstant = false;
break;
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
index 7d45545ade..f165082d85 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -48,7 +48,7 @@ public class IntLiteral extends Literal {
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
Integer intValue = (Integer) this.value.getValue();
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
index 4f03d8d292..a382da22fe 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 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.
@@ -42,12 +42,12 @@ public class LongLiteral extends Literal {
public TypedValue getLiteralValue() {
return this.value;
}
-
+
@Override
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
mv.visitLdcInsn(this.value.getValue());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
index dabe76cf53..ee265c072e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -301,7 +301,7 @@ public class MethodReference extends SpelNodeImpl {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
CachedMethodExecutor executorToCheck = this.cachedExecutor;
@@ -332,7 +332,7 @@ public class MethodReference extends SpelNodeImpl {
// Something on the stack when nothing is needed
mv.visitInsn(POP);
}
-
+
if (CodeFlow.isPrimitive(descriptor)) {
CodeFlow.insertBoxIfNecessary(mv, descriptor.charAt(0));
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
index 87dcf4f834..f88ab2c9fa 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/NullLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -48,7 +48,7 @@ public class NullLiteral extends Literal {
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
mv.visitInsn(ACONST_NULL);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
index e31b779373..c7e7ef7013 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpAnd.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -78,7 +78,7 @@ public class OpAnd extends Operator {
CodeFlow.isBooleanCompatible(left.exitTypeDescriptor) &&
CodeFlow.isBooleanCompatible(right.exitTypeDescriptor));
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
// Pseudo: if (!leftOperandValue) { result=false; } else { result=rightOperandValue; }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
index 2b9d4fc069..95fe67f7a1 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -95,13 +95,13 @@ public class OpDivide extends Operator {
return false;
}
if (this.children.length > 1) {
- if (!getRightOperand().isCompilable()) {
- return false;
- }
+ if (!getRightOperand().isCompilable()) {
+ return false;
+ }
}
return (this.exitTypeDescriptor != null);
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
getLeftOperand().generateCode(mv, cf);
@@ -123,12 +123,12 @@ public class OpDivide extends Operator {
case 'J':
mv.visitInsn(LDIV);
break;
- case 'F':
+ case 'F':
mv.visitInsn(FDIV);
break;
case 'D':
mv.visitInsn(DDIV);
- break;
+ break;
default:
throw new IllegalStateException(
"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
index 8478ba140e..1bf3776c80 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGE.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.
@@ -49,7 +49,7 @@ public class OpGE extends Operator {
this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
-
+
if (left instanceof Number && right instanceof Number) {
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
@@ -90,12 +90,12 @@ public class OpGE extends Operator {
return BooleanTypedValue.forValue(state.getTypeComparator().compare(left, right) >= 0);
}
-
+
@Override
public boolean isCompilable() {
return isCompilableOperatorUsingNumerics();
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
generateComparisonCode(mv, cf, IFLT, IF_ICMPLT);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
index 9cb9ec2a8b..e43c3a02cf 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpGT.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.
@@ -49,7 +49,7 @@ public class OpGT extends Operator {
this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
-
+
if (left instanceof Number && right instanceof Number) {
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
@@ -100,7 +100,7 @@ public class OpGT extends Operator {
public boolean isCompilable() {
return isCompilableOperatorUsingNumerics();
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
generateComparisonCode(mv, cf, IFLE, IF_ICMPLE);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
index 65079f0ba7..12432cb083 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLE.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.
@@ -49,7 +49,7 @@ public class OpLE extends Operator {
this.leftActualDescriptor = CodeFlow.toDescriptorFromObject(left);
this.rightActualDescriptor = CodeFlow.toDescriptorFromObject(right);
-
+
if (left instanceof Number && right instanceof Number) {
Number leftNumber = (Number) left;
Number rightNumber = (Number) right;
@@ -90,12 +90,12 @@ public class OpLE extends Operator {
return BooleanTypedValue.forValue(state.getTypeComparator().compare(left, right) <= 0);
}
-
+
@Override
public boolean isCompilable() {
return isCompilableOperatorUsingNumerics();
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
generateComparisonCode(mv, cf, IFGT, IF_ICMPGT);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
index 4f0857595e..d563c5c4e6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.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.
@@ -95,12 +95,12 @@ public class OpLT extends Operator {
return BooleanTypedValue.forValue(state.getTypeComparator().compare(left, right) < 0);
}
-
+
@Override
public boolean isCompilable() {
return isCompilableOperatorUsingNumerics();
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
generateComparisonCode(mv, cf, IFGE, IF_ICMPGE);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
index 8be68cbbe8..226159aab0 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpModulus.java
@@ -93,9 +93,9 @@ public class OpModulus extends Operator {
return false;
}
if (this.children.length > 1) {
- if (!getRightOperand().isCompilable()) {
- return false;
- }
+ if (!getRightOperand().isCompilable()) {
+ return false;
+ }
}
return (this.exitTypeDescriptor != null);
}
@@ -121,12 +121,12 @@ public class OpModulus extends Operator {
case 'J':
mv.visitInsn(LREM);
break;
- case 'F':
+ case 'F':
mv.visitInsn(FREM);
break;
case 'D':
mv.visitInsn(DREM);
- break;
+ break;
default:
throw new IllegalStateException(
"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index 16491e7722..2fc68216ee 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -126,13 +126,13 @@ public class OpMultiply extends Operator {
return false;
}
if (this.children.length > 1) {
- if (!getRightOperand().isCompilable()) {
- return false;
- }
+ if (!getRightOperand().isCompilable()) {
+ return false;
+ }
}
return (this.exitTypeDescriptor != null);
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
getLeftOperand().generateCode(mv, cf);
@@ -154,12 +154,12 @@ public class OpMultiply extends Operator {
case 'J':
mv.visitInsn(LMUL);
break;
- case 'F':
+ case 'F':
mv.visitInsn(FMUL);
break;
case 'D':
mv.visitInsn(DMUL);
- break;
+ break;
default:
throw new IllegalStateException(
"Unrecognized exit type descriptor: '" + this.exitTypeDescriptor + "'");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
index e1c87c2e66..3e9da04f55 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpOr.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -77,7 +77,7 @@ public class OpOr extends Operator {
CodeFlow.isBooleanCompatible(left.exitTypeDescriptor) &&
CodeFlow.isBooleanCompatible(right.exitTypeDescriptor));
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
// pseudo: if (leftOperandValue) { result=true; } else { result=rightOperandValue; }
@@ -98,5 +98,5 @@ public class OpOr extends Operator {
mv.visitLabel(endOfIf);
cf.pushDescriptor(this.exitTypeDescriptor);
}
-
+
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
index fdcb21675a..0d866adfec 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
@@ -178,9 +178,9 @@ public class OpPlus extends Operator {
return false;
}
if (this.children.length > 1) {
- if (!getRightOperand().isCompilable()) {
- return false;
- }
+ if (!getRightOperand().isCompilable()) {
+ return false;
+ }
}
return (this.exitTypeDescriptor != null);
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
index 57513f6768..f57cc20184 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -39,7 +39,7 @@ public class OperatorInstanceof extends Operator {
@Nullable
private Class type;
-
+
public OperatorInstanceof(int pos, SpelNodeImpl... operands) {
super("instanceof", pos, operands);
@@ -76,7 +76,7 @@ public class OperatorInstanceof extends Operator {
}
this.type = rightClass;
if (rightOperand instanceof TypeReference) {
- // Can only generate bytecode where the right operand is a direct type reference,
+ // Can only generate bytecode where the right operand is a direct type reference,
// not if it is indirect (for example when right operand is a variable reference)
this.exitTypeDescriptor = "Z";
}
@@ -87,7 +87,7 @@ public class OperatorInstanceof extends Operator {
public boolean isCompilable() {
return (this.exitTypeDescriptor != null && getLeftOperand().isCompilable());
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
getLeftOperand().generateCode(mv, cf);
@@ -98,7 +98,7 @@ public class OperatorInstanceof extends Operator {
// in case it had side effects
mv.visitInsn(POP);
mv.visitInsn(ICONST_0); // value of false
- }
+ }
else {
mv.visitTypeInsn(INSTANCEOF, Type.getInternalName(this.type));
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
index 73310399da..177aca169c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorNot.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.
@@ -60,20 +60,20 @@ public class OperatorNot extends SpelNodeImpl { // Not is a unary operator so d
public String toStringAST() {
return "!" + getChild(0).toStringAST();
}
-
+
@Override
public boolean isCompilable() {
SpelNodeImpl child = this.children[0];
return (child.isCompilable() && CodeFlow.isBooleanCompatible(child.exitTypeDescriptor));
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
this.children[0].generateCode(mv, cf);
cf.unboxBooleanIfNecessary(mv);
Label elseTarget = new Label();
Label endOfIf = new Label();
- mv.visitJumpInsn(IFNE,elseTarget);
+ mv.visitJumpInsn(IFNE,elseTarget);
mv.visitInsn(ICONST_1); // TRUE
mv.visitJumpInsn(GOTO,endOfIf);
mv.visitLabel(elseTarget);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
index 5dcfe7651a..3f294d38a5 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
@@ -328,14 +328,14 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
resolvers.addAll(generalAccessors);
return resolvers;
}
-
+
@Override
public boolean isCompilable() {
PropertyAccessor accessorToUse = this.cachedReadAccessor;
return (accessorToUse instanceof CompilablePropertyAccessor &&
((CompilablePropertyAccessor) accessorToUse).isCompilable());
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
PropertyAccessor accessorToUse = this.cachedReadAccessor;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
index 4e25289c36..2ef6704f21 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.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.
@@ -47,7 +47,7 @@ public class RealLiteral extends Literal {
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
mv.visitLdcInsn(this.value.getValue());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
index 0143c9d257..aed04c557f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
@@ -194,7 +194,7 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
public abstract TypedValue getValueInternal(ExpressionState expressionState) throws EvaluationException;
-
+
/**
* Generate code that handles building the argument values for the specified method.
* This method will take account of whether the invoked method is a varargs method
@@ -222,12 +222,12 @@ public abstract class SpelNodeImpl implements SpelNode, Opcodes {
// have been passed to satisfy the varargs and so something needs to be built.
int p = 0; // Current supplied argument being processed
int childCount = arguments.length;
-
+
// Fulfill all the parameter requirements except the last one
for (p = 0; p < paramDescriptors.length - 1; p++) {
generateCodeForArgument(mv, cf, arguments[p], paramDescriptors[p]);
}
-
+
SpelNodeImpl lastChild = (childCount == 0 ? null : arguments[childCount - 1]);
String arrayType = paramDescriptors[paramDescriptors.length - 1];
// Determine if the final passed argument is already suitably packaged in array
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java
index 930bc4738d..01ec13b3b4 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/StringLiteral.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.
@@ -49,12 +49,12 @@ public class StringLiteral extends Literal {
public String toString() {
return "'" + getLiteralValue().getValue() + "'";
}
-
+
@Override
public boolean isCompilable() {
return true;
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
mv.visitLdcInsn(this.value.getValue());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
index d058ec9efa..8f6a039631 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -59,7 +59,7 @@ public class Ternary extends SpelNodeImpl {
computeExitTypeDescriptor();
return result;
}
-
+
@Override
public String toStringAST() {
return getChild(0).toStringAST() + " ? " + getChild(1).toStringAST() + " : " + getChild(2).toStringAST();
@@ -89,7 +89,7 @@ public class Ternary extends SpelNodeImpl {
CodeFlow.isBooleanCompatible(condition.exitTypeDescriptor) &&
left.exitTypeDescriptor != null && right.exitTypeDescriptor != null);
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
// May reach here without it computed if all elements are literals
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
index 1013fde9b4..206c96b0b7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
@@ -78,7 +78,7 @@ public class VariableReference extends SpelNodeImpl {
if (value == null || !Modifier.isPublic(value.getClass().getModifiers())) {
// If the type is not public then when generateCode produces a checkcast to it
// then an IllegalAccessError will occur.
- // If resorting to Object isn't sufficient, the hierarchy could be traversed for
+ // If resorting to Object isn't sufficient, the hierarchy could be traversed for
// the first public type.
this.exitTypeDescriptor = "Ljava/lang/Object";
}
@@ -108,7 +108,7 @@ public class VariableReference extends SpelNodeImpl {
public boolean isCompilable() {
return (this.exitTypeDescriptor != null);
}
-
+
@Override
public void generateCode(MethodVisitor mv, CodeFlow cf) {
if (this.name.equals(ROOT)) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index 6f4d8c6473..3c418d9464 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -385,10 +385,10 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
@Nullable
protected Method findGetterForProperty(String propertyName, Class clazz, boolean mustBeStatic) {
Method method = findMethodForProperty(getPropertyMethodSuffixes(propertyName),
- "get", clazz, mustBeStatic, 0, ANY_TYPES);
+ "get", clazz, mustBeStatic, 0, ANY_TYPES);
if (method == null) {
method = findMethodForProperty(getPropertyMethodSuffixes(propertyName),
- "is", clazz, mustBeStatic, 0, BOOLEAN_TYPES);
+ "is", clazz, mustBeStatic, 0, BOOLEAN_TYPES);
}
return method;
}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
index c8cbac7ef0..75a5589a28 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
@@ -203,7 +203,7 @@ public class StandardEvaluationContext implements EvaluationContext {
@Override
public TypeConverter getTypeConverter() {
if (this.typeConverter == null) {
- this.typeConverter = new StandardTypeConverter();
+ this.typeConverter = new StandardTypeConverter();
}
return this.typeConverter;
}
diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/Log.java b/spring-jcl/src/main/java/org/apache/commons/logging/Log.java
index 2f2b6f9eaa..2f61b0f148 100644
--- a/spring-jcl/src/main/java/org/apache/commons/logging/Log.java
+++ b/spring-jcl/src/main/java/org/apache/commons/logging/Log.java
@@ -129,17 +129,17 @@ public interface Log {
void fatal(Object message, Throwable t);
/**
- * Logs a message with error log level.
- * @param message log this message
- */
- void error(Object message);
+ * Logs a message with error log level.
+ * @param message log this message
+ */
+ void error(Object message);
- /**
- * Logs an error with error log level.
- * @param message log this message
- * @param t log this cause
- */
- void error(Object message, Throwable t);
+ /**
+ * Logs an error with error log level.
+ * @param message log this message
+ * @param t log this cause
+ */
+ void error(Object message, Throwable t);
/**
* Logs a message with warn log level.
@@ -154,18 +154,18 @@ public interface Log {
*/
void warn(Object message, Throwable t);
- /**
- * Logs a message with info log level.
- * @param message log this message
- */
- void info(Object message);
+ /**
+ * Logs a message with info log level.
+ * @param message log this message
+ */
+ void info(Object message);
- /**
- * Logs an error with info log level.
- * @param message log this message
- * @param t log this cause
- */
- void info(Object message, Throwable t);
+ /**
+ * Logs an error with info log level.
+ * @param message log this message
+ * @param t log this cause
+ */
+ void info(Object message, Throwable t);
/**
* Logs a message with debug log level.
@@ -181,16 +181,16 @@ public interface Log {
void debug(Object message, Throwable t);
/**
- * Logs a message with trace log level.
- * @param message log this message
- */
- void trace(Object message);
+ * Logs a message with trace log level.
+ * @param message log this message
+ */
+ void trace(Object message);
- /**
- * Logs an error with trace log level.
- * @param message log this message
- * @param t log this cause
- */
- void trace(Object message, Throwable t);
+ /**
+ * Logs an error with trace log level.
+ * @param message log this message
+ * @param t log this cause
+ */
+ void trace(Object message, Throwable t);
}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
index 5662143127..bff87c4fc1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
@@ -90,20 +90,20 @@ public interface TableMetaDataProvider {
/**
* Are we using the meta-data for the table columns?
*/
- boolean isTableColumnMetaDataUsed();
+ boolean isTableColumnMetaDataUsed();
/**
* Does this database support the JDBC 3.0 feature of retrieving generated keys:
* {@link java.sql.DatabaseMetaData#supportsGetGeneratedKeys()}?
*/
- boolean isGetGeneratedKeysSupported();
+ boolean isGetGeneratedKeysSupported();
/**
* Does this database support a simple query to retrieve the generated key when
* the JDBC 3.0 feature of retrieving generated keys is not supported?
* @see #isGetGeneratedKeysSupported()
*/
- boolean isGetGeneratedKeysSimulated();
+ boolean isGetGeneratedKeysSimulated();
/**
* Get the simple query to retrieve a generated key.
@@ -115,7 +115,7 @@ public interface TableMetaDataProvider {
* Does this database support a column name String array for retrieving generated keys:
* {@link java.sql.Connection#createStruct(String, Object[])}?
*/
- boolean isGeneratedKeysColumnNameArraySupported();
+ boolean isGeneratedKeysColumnNameArraySupported();
/**
* Get the table parameter meta-data that is currently used.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
index 7ff8d0f102..31524366c8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -50,7 +50,7 @@ public class NamedParameterJdbcDaoSupport extends JdbcDaoSupport {
*/
@Nullable
public NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() {
- return this.namedParameterJdbcTemplate;
+ return this.namedParameterJdbcTemplate;
}
}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
index 7185126b6b..4b1753f792 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
@@ -96,7 +96,7 @@ public abstract class JdbcDaoSupport extends DaoSupport {
*/
@Nullable
public final JdbcTemplate getJdbcTemplate() {
- return this.jdbcTemplate;
+ return this.jdbcTemplate;
}
/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
index 6089358584..d823aef7ea 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
@@ -228,7 +228,7 @@ public abstract class SqlQuery extends SqlOperation {
String sqlToUse = NamedParameterUtils.substituteNamedParameters(parsedSql, paramSource);
Object[] params = NamedParameterUtils.buildValueArray(parsedSql, paramSource, getDeclaredParameters());
RowMapper rowMapper = newRowMapper(params, context);
- return getJdbcTemplate().query(newPreparedStatementCreator(sqlToUse, params), rowMapper);
+ return getJdbcTemplate().query(newPreparedStatementCreator(sqlToUse, params), rowMapper);
}
/**
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java
index 33f5fac6d6..d1f0a690c6 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java
@@ -72,7 +72,7 @@ public @interface SendToUser {
* or only to the session of the input message being handled.
* By default, this is set to {@code true} in which case messages are
* broadcast to all sessions.
- */
- boolean broadcast() default true;
+ */
+ boolean broadcast() default true;
}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
index 7f8fbc69b6..b4f732d436 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
@@ -467,8 +467,8 @@ public class MessageHeaderAccessor {
@Nullable
public Object getReplyChannel() {
- return getHeader(MessageHeaders.REPLY_CHANNEL);
- }
+ return getHeader(MessageHeaders.REPLY_CHANNEL);
+ }
public void setErrorChannelName(String errorChannelName) {
setHeader(MessageHeaders.ERROR_CHANNEL, errorChannelName);
@@ -480,8 +480,8 @@ public class MessageHeaderAccessor {
@Nullable
public Object getErrorChannel() {
- return getHeader(MessageHeaders.ERROR_CHANNEL);
- }
+ return getHeader(MessageHeaders.ERROR_CHANNEL);
+ }
// Log message stuff
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java
index b8927c3d7d..e60336a6f5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -113,7 +113,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
*/
@Nullable
public final HibernateTemplate getHibernateTemplate() {
- return this.hibernateTemplate;
+ return this.hibernateTemplate;
}
@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index e3f2af7245..1e7583a7a6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -311,12 +311,12 @@ public class PersistenceAnnotationBeanPostProcessor
}
public void setOrder(int order) {
- this.order = order;
+ this.order = order;
}
@Override
public int getOrder() {
- return this.order;
+ return this.order;
}
@Override
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index 6c91c0088b..40e9cd537c 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -767,7 +767,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
else {
throw new IllegalArgumentException("DOMSource contains neither Document nor Element");
}
- return doUnmarshal(streamReader, null);
+ return doUnmarshal(streamReader, null);
}
@Override
@@ -783,7 +783,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
@Override
protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) throws XmlMappingException {
- return doUnmarshal(new StaxReader(new QNameMap(), streamReader, this.nameCoder), null);
+ return doUnmarshal(new StaxReader(new QNameMap(), streamReader, this.nameCoder), null);
}
@Override
@@ -800,12 +800,12 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
}
public Object unmarshalInputStream(InputStream inputStream, @Nullable DataHolder dataHolder) throws XmlMappingException, IOException {
- if (this.streamDriver != null) {
- return doUnmarshal(this.streamDriver.createReader(inputStream), dataHolder);
- }
- else {
- return unmarshalReader(new InputStreamReader(inputStream, this.encoding), dataHolder);
- }
+ if (this.streamDriver != null) {
+ return doUnmarshal(this.streamDriver.createReader(inputStream), dataHolder);
+ }
+ else {
+ return unmarshalReader(new InputStreamReader(inputStream, this.encoding), dataHolder);
+ }
}
@Override
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
index d0bcbdcfe6..0c582920c9 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
@@ -94,7 +94,7 @@ public class MockAsyncContext implements AsyncContext {
@Override
public void dispatch() {
dispatch(this.request.getRequestURI());
- }
+ }
@Override
public void dispatch(String path) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
index 59d29d62be..f02a674227 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
@@ -71,7 +71,7 @@ public interface MvcResult {
* @return an exception, or {@code null} if none
*/
@Nullable
- Exception getResolvedException();
+ Exception getResolvedException();
/**
* Return the "output" flash attributes saved during request processing.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index e243e980f5..86892e3a8c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -269,11 +269,11 @@ public abstract class MockMvcRequestBuilders {
mvcResult.getAsyncResult();
return servletContext -> {
- MockHttpServletRequest request = mvcResult.getRequest();
- request.setDispatcherType(DispatcherType.ASYNC);
- request.setAsyncStarted(false);
- return request;
- };
+ MockHttpServletRequest request = mvcResult.getRequest();
+ request.setDispatcherType(DispatcherType.ASYNC);
+ request.setAsyncStarted(false);
+ return request;
+ };
}
}
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
index a893402e38..c3f00f17f9 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
@@ -81,17 +81,17 @@ public class ModelResultMatchers {
};
}
- /**
- * Assert the given model attributes do not exist.
- */
- public ResultMatcher attributeDoesNotExist(final String... names) {
- return result -> {
+ /**
+ * Assert the given model attributes do not exist.
+ */
+ public ResultMatcher attributeDoesNotExist(final String... names) {
+ return result -> {
ModelAndView mav = getModelAndView(result);
for (String name : names) {
assertTrue("Model attribute '" + name + "' exists", mav.getModel().get(name) == null);
}
};
- }
+ }
/**
* Assert the given model attribute(s) have errors.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index b8e6addf4d..6ef997bf4b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -445,31 +445,31 @@ public class StatusResultMatchers {
}
/**
- * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
- * @deprecated matching the deprecation of {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE}
- */
- @Deprecated
- public ResultMatcher isInsufficientSpaceOnResource() {
- return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
- }
+ * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
+ * @deprecated matching the deprecation of {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE}
+ */
+ @Deprecated
+ public ResultMatcher isInsufficientSpaceOnResource() {
+ return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
+ }
- /**
- * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
- * @deprecated matching the deprecation of {@code HttpStatus.METHOD_FAILURE}
- */
- @Deprecated
- public ResultMatcher isMethodFailure() {
- return matcher(HttpStatus.METHOD_FAILURE);
- }
+ /**
+ * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
+ * @deprecated matching the deprecation of {@code HttpStatus.METHOD_FAILURE}
+ */
+ @Deprecated
+ public ResultMatcher isMethodFailure() {
+ return matcher(HttpStatus.METHOD_FAILURE);
+ }
- /**
- * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
- * @deprecated matching the deprecation of {@code HttpStatus.DESTINATION_LOCKED}
- */
- @Deprecated
- public ResultMatcher isDestinationLocked() {
- return matcher(HttpStatus.DESTINATION_LOCKED);
- }
+ /**
+ * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
+ * @deprecated matching the deprecation of {@code HttpStatus.DESTINATION_LOCKED}
+ */
+ @Deprecated
+ public ResultMatcher isDestinationLocked() {
+ return matcher(HttpStatus.DESTINATION_LOCKED);
+ }
/**
* Assert the response status code is {@code HttpStatus.UNPROCESSABLE_ENTITY} (422).
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
index 3dcc2e72cc..5d641efefc 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
@@ -56,7 +56,7 @@ public abstract class CciDaoSupport extends DaoSupport {
*/
public final void setConnectionFactory(ConnectionFactory connectionFactory) {
if (this.cciTemplate == null || connectionFactory != this.cciTemplate.getConnectionFactory()) {
- this.cciTemplate = createCciTemplate(connectionFactory);
+ this.cciTemplate = createCciTemplate(connectionFactory);
}
}
@@ -95,7 +95,7 @@ public abstract class CciDaoSupport extends DaoSupport {
*/
@Nullable
public final CciTemplate getCciTemplate() {
- return this.cciTemplate;
+ return this.cciTemplate;
}
@Override
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
index 1a45e9f923..d3cc231bbe 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -159,7 +159,7 @@ public class HttpComponentsAsyncClientHttpRequestFactory extends HttpComponentsC
}
private HttpAsyncClient startAsyncClient() {
- HttpAsyncClient client = getAsyncClient();
+ HttpAsyncClient client = getAsyncClient();
if (client instanceof CloseableHttpAsyncClient) {
CloseableHttpAsyncClient closeableAsyncClient = (CloseableHttpAsyncClient) client;
if (!closeableAsyncClient.isRunning()) {
@@ -175,10 +175,10 @@ public class HttpComponentsAsyncClientHttpRequestFactory extends HttpComponentsC
HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri);
postProcessHttpRequest(httpRequest);
- HttpContext context = createHttpContext(httpMethod, uri);
- if (context == null) {
- context = HttpClientContext.create();
- }
+ HttpContext context = createHttpContext(httpMethod, uri);
+ if (context == null) {
+ context = HttpClientContext.create();
+ }
// Request configuration not set in the context
if (context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) {
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
index edfa670bf8..cdad3f8805 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -82,21 +82,21 @@ final class HttpComponentsClientHttpResponse extends AbstractClientHttpResponse
@Override
public void close() {
- // Release underlying connection back to the connection manager
- try {
- try {
- // Attempt to keep connection alive by consuming its remaining content
- EntityUtils.consume(this.httpResponse.getEntity());
- }
+ // Release underlying connection back to the connection manager
+ try {
+ try {
+ // Attempt to keep connection alive by consuming its remaining content
+ EntityUtils.consume(this.httpResponse.getEntity());
+ }
finally {
if (this.httpResponse instanceof Closeable) {
((Closeable) this.httpResponse).close();
}
- }
- }
- catch (IOException ex) {
+ }
+ }
+ catch (IOException ex) {
// Ignore exception on close...
- }
+ }
}
}
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestDecorator.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestDecorator.java
index e441cbb30f..2979f7e258 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestDecorator.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestDecorator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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,7 +38,7 @@ import org.springframework.util.MultiValueMap;
* @since 5.0
*/
public class ClientHttpRequestDecorator implements ClientHttpRequest {
-
+
private final ClientHttpRequest delegate;
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java
index 2ca32e3de6..8880d50935 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java
@@ -33,7 +33,7 @@ import org.springframework.util.MultiValueMap;
* @since 5.0
*/
public class ClientHttpResponseDecorator implements ClientHttpResponse {
-
+
private final ClientHttpResponse delegate;
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
index 2634152df1..c37e09573e 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
@@ -35,63 +35,63 @@ import org.springframework.lang.Nullable;
public final class ServerSentEvent {
@Nullable
- private final String id;
+ private final String id;
@Nullable
- private final String event;
+ private final String event;
@Nullable
- private final Duration retry;
+ private final Duration retry;
@Nullable
- private final String comment;
+ private final String comment;
@Nullable
private final T data;
- private ServerSentEvent(@Nullable String id, @Nullable String event, @Nullable Duration retry,
+ private ServerSentEvent(@Nullable String id, @Nullable String event, @Nullable Duration retry,
@Nullable String comment, @Nullable T data) {
- this.id = id;
- this.event = event;
- this.retry = retry;
- this.comment = comment;
+ this.id = id;
+ this.event = event;
+ this.retry = retry;
+ this.comment = comment;
this.data = data;
- }
+ }
- /**
- * Return the {@code id} field of this event, if available.
- */
- @Nullable
- public String id() {
- return this.id;
- }
-
- /**
- * Return the {@code event} field of this event, if available.
- */
+ /**
+ * Return the {@code id} field of this event, if available.
+ */
@Nullable
- public String event() {
- return this.event;
- }
+ public String id() {
+ return this.id;
+ }
- /**
- * Return the {@code retry} field of this event, if available.
- */
+ /**
+ * Return the {@code event} field of this event, if available.
+ */
@Nullable
- public Duration retry() {
- return this.retry;
- }
+ public String event() {
+ return this.event;
+ }
- /**
- * Return the comment of this event, if available.
- */
+ /**
+ * Return the {@code retry} field of this event, if available.
+ */
@Nullable
- public String comment() {
- return this.comment;
- }
+ public Duration retry() {
+ return this.retry;
+ }
+
+ /**
+ * Return the comment of this event, if available.
+ */
+ @Nullable
+ public String comment() {
+ return this.comment;
+ }
/**
* Return the {@code data} field of this event, if available.
@@ -102,11 +102,11 @@ public final class ServerSentEvent {
}
- @Override
- public String toString() {
- return ("ServerSentEvent [id = '" + this.id + "\', event='" + this.event + "\', retry=" +
+ @Override
+ public String toString() {
+ return ("ServerSentEvent [id = '" + this.id + "\', event='" + this.event + "\', retry=" +
this.retry + ", comment='" + this.comment + "', data=" + this.data + ']');
- }
+ }
/**
@@ -128,41 +128,41 @@ public final class ServerSentEvent {
}
- /**
- * A mutable builder for a {@code SseEvent}.
- *
- * @param the type of data that this event contains
- */
- public interface Builder {
+ /**
+ * A mutable builder for a {@code SseEvent}.
+ *
+ * @param the type of data that this event contains
+ */
+ public interface Builder {
- /**
- * Set the value of the {@code id} field.
- * @param id the value of the id field
- * @return {@code this} builder
- */
- Builder id(String id);
+ /**
+ * Set the value of the {@code id} field.
+ * @param id the value of the id field
+ * @return {@code this} builder
+ */
+ Builder id(String id);
- /**
- * Set the value of the {@code event} field.
- * @param event the value of the event field
- * @return {@code this} builder
- */
- Builder event(String event);
+ /**
+ * Set the value of the {@code event} field.
+ * @param event the value of the event field
+ * @return {@code this} builder
+ */
+ Builder event(String event);
- /**
- * Set the value of the {@code retry} field.
- * @param retry the value of the retry field
- * @return {@code this} builder
- */
- Builder retry(Duration retry);
+ /**
+ * Set the value of the {@code retry} field.
+ * @param retry the value of the retry field
+ * @return {@code this} builder
+ */
+ Builder retry(Duration retry);
- /**
- * Set SSE comment. If a multi-line comment is provided, it will be turned into multiple
- * SSE comment lines as defined in Server-Sent Events W3C recommendation.
- * @param comment the comment to set
- * @return {@code this} builder
- */
- Builder comment(String comment);
+ /**
+ * Set SSE comment. If a multi-line comment is provided, it will be turned into multiple
+ * SSE comment lines as defined in Server-Sent Events W3C recommendation.
+ * @param comment the comment to set
+ * @return {@code this} builder
+ */
+ Builder comment(String comment);
/**
* Set the value of the {@code data} field. If the {@code data} argument is a multi-line
@@ -174,61 +174,61 @@ public final class ServerSentEvent {
*/
Builder data(@Nullable T data);
- /**
- * Builds the event.
- * @return the built event
- */
- ServerSentEvent build();
- }
+ /**
+ * Builds the event.
+ * @return the built event
+ */
+ ServerSentEvent build();
+ }
- private static class BuilderImpl implements Builder {
+ private static class BuilderImpl implements Builder {
@Nullable
- private String id;
+ private String id;
@Nullable
- private String event;
+ private String event;
@Nullable
- private Duration retry;
+ private Duration retry;
@Nullable
- private String comment;
+ private String comment;
@Nullable
private T data;
public BuilderImpl() {
- }
+ }
- public BuilderImpl(T data) {
- this.data = data;
- }
+ public BuilderImpl(T data) {
+ this.data = data;
+ }
- @Override
- public Builder id(String id) {
- this.id = id;
- return this;
- }
+ @Override
+ public Builder id(String id) {
+ this.id = id;
+ return this;
+ }
- @Override
- public Builder event(String event) {
- this.event = event;
- return this;
- }
+ @Override
+ public Builder event(String event) {
+ this.event = event;
+ return this;
+ }
- @Override
- public Builder retry(Duration retry) {
- this.retry = retry;
- return this;
- }
+ @Override
+ public Builder retry(Duration retry) {
+ this.retry = retry;
+ return this;
+ }
- @Override
- public Builder comment(String comment) {
- this.comment = comment;
- return this;
- }
+ @Override
+ public Builder comment(String comment) {
+ this.comment = comment;
+ return this;
+ }
@Override
public Builder data(@Nullable T data) {
@@ -236,10 +236,10 @@ public final class ServerSentEvent {
return this;
}
- @Override
- public ServerSentEvent build() {
- return new ServerSentEvent<>(this.id, this.event, this.retry, this.comment, this.data);
- }
- }
+ @Override
+ public ServerSentEvent build() {
+ return new ServerSentEvent<>(this.id, this.event, this.retry, this.comment, this.data);
+ }
+ }
}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
index 3d8ef96b84..14e6b7762d 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
@@ -176,7 +176,7 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple
return buffer;
}
-
+
protected ObjectWriter customizeWriter(ObjectWriter writer, @Nullable MimeType mimeType,
ResolvableType elementType, @Nullable Map hints) {
@@ -227,5 +227,5 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple
protected A getAnnotation(MethodParameter parameter, Class annotType) {
return parameter.getMethodAnnotation(annotType);
}
-
+
}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
index 6ba6ceed6c..286b25dc42 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
@@ -48,7 +48,7 @@ public class Jackson2JsonEncoder extends AbstractJackson2Encoder {
@Nullable
private final PrettyPrinter ssePrettyPrinter;
-
+
public Jackson2JsonEncoder() {
this(Jackson2ObjectMapperBuilder.json().build());
@@ -70,7 +70,7 @@ public class Jackson2JsonEncoder extends AbstractJackson2Encoder {
@Override
protected ObjectWriter customizeWriter(ObjectWriter writer, @Nullable MimeType mimeType,
ResolvableType elementType, @Nullable Map hints) {
-
+
return (this.ssePrettyPrinter != null &&
MediaType.TEXT_EVENT_STREAM.isCompatibleWith(mimeType) &&
writer.getConfig().isEnabled(SerializationFeature.INDENT_OUTPUT) ?
diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
index 05617bd3fa..0259f19e3a 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileEncoder.java
@@ -43,8 +43,8 @@ public class Jackson2SmileEncoder extends AbstractJackson2Encoder {
private static final MimeType[] DEFAULT_SMILE_MIME_TYPES = new MimeType[] {
new MimeType("application", "x-jackson-smile", StandardCharsets.UTF_8),
new MimeType("application", "*+x-jackson-smile", StandardCharsets.UTF_8)};
-
-
+
+
public Jackson2SmileEncoder() {
this(Jackson2ObjectMapperBuilder.smile().build(), DEFAULT_SMILE_MIME_TYPES);
}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
index 0e3c34277d..4267c4a6dc 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -118,7 +118,7 @@ public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implem
private final ReactiveHttpInputMessage inputMessage;
private final DataBufferFactory bufferFactory;
-
+
private final PartBodyStreamStorageFactory streamStorageFactory;
SynchronossPartGenerator(ReactiveHttpInputMessage inputMessage, DataBufferFactory bufferFactory,
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
index 63f87a71eb..decb36208d 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ExtensionRegistryInitializer.java
@@ -35,6 +35,6 @@ public interface ExtensionRegistryInitializer {
* Initializes the {@code ExtensionRegistry} with Protocol Message extensions.
* @param registry the registry to populate
*/
- void initializeExtensionRegistry(ExtensionRegistry registry);
+ void initializeExtensionRegistry(ExtensionRegistry registry);
}
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
index 4aa5b0865f..86368d20ed 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -108,10 +108,10 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest {
private static HttpHeaders initHeaders(HttpServletRequest request) {
HttpHeaders headers = new HttpHeaders();
for (Enumeration names = request.getHeaderNames();
- names.hasMoreElements(); ) {
+ names.hasMoreElements(); ) {
String name = (String) names.nextElement();
for (Enumeration values = request.getHeaders(name);
- values.hasMoreElements(); ) {
+ values.hasMoreElements(); ) {
headers.add(name, (String) values.nextElement());
}
}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
index 314aadaaa9..a3e36cec0c 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 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.
@@ -63,10 +63,10 @@ public class HessianServiceExporter extends HessianExporter implements HttpReque
response.setContentType(CONTENT_TYPE_HESSIAN);
try {
- invoke(request.getInputStream(), response.getOutputStream());
+ invoke(request.getInputStream(), response.getOutputStream());
}
catch (Throwable ex) {
- throw new NestedServletException("Hessian skeleton invocation failed", ex);
+ throw new NestedServletException("Hessian skeleton invocation failed", ex);
}
}
diff --git a/spring-web/src/main/java/org/springframework/web/server/DefaultServerWebExchangeBuilder.java b/spring-web/src/main/java/org/springframework/web/server/DefaultServerWebExchangeBuilder.java
index 61a4ddb46b..dd1ba3b428 100644
--- a/spring-web/src/main/java/org/springframework/web/server/DefaultServerWebExchangeBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/server/DefaultServerWebExchangeBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
/**
* Package-private implementation of {@link ServerWebExchange.Builder}.
- *
+ *
* @author Rossen Stoyanchev
* @since 5.0
*/
diff --git a/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java b/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
index a06faa1768..aaa68cadaf 100644
--- a/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
@@ -25,7 +25,7 @@ import org.springframework.web.server.ServerWebExchange;
/**
* Request and response header-based {@link WebSessionIdResolver}.
- *
+ *
* @author Greg Turnquist
* @author Rob Winch
* @since 5.0
diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
index ba6bd078f4..97375052bd 100644
--- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
+++ b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -58,7 +58,7 @@ public class CookieGenerator {
private String cookiePath = DEFAULT_COOKIE_PATH;
- @Nullable
+ @Nullable
private Integer cookieMaxAge;
private boolean cookieSecure = false;
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
index 4d00262dc3..a7ac1c77a0 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
@@ -124,7 +124,7 @@ class HtmlCharacterEntityReferences {
*/
@Nullable
public String convertToReference(char character) {
- return convertToReference(character, WebUtils.DEFAULT_CHARACTER_ENCODING);
+ return convertToReference(character, WebUtils.DEFAULT_CHARACTER_ENCODING);
}
/**
diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
index 677fdbcfde..52c63d203b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
@@ -36,25 +36,25 @@ import org.springframework.util.SystemPropertyUtils;
*/
public abstract class ServletContextPropertyUtils {
- private static final PropertyPlaceholderHelper strictHelper =
- new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
+ private static final PropertyPlaceholderHelper strictHelper =
+ new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR, false);
- private static final PropertyPlaceholderHelper nonStrictHelper =
- new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
+ private static final PropertyPlaceholderHelper nonStrictHelper =
+ new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR, true);
/**
* Resolve ${...} placeholders in the given text, replacing them with corresponding
* servlet context init parameter or system property values.
- * @param text the String to resolve
- * @param servletContext the servletContext to use for lookups.
+ * @param text the String to resolve
+ * @param servletContext the servletContext to use for lookups.
* @return the resolved String
* @throws IllegalArgumentException if there is an unresolvable placeholder
* @see SystemPropertyUtils#PLACEHOLDER_PREFIX
* @see SystemPropertyUtils#PLACEHOLDER_SUFFIX
- * @see SystemPropertyUtils#resolvePlaceholders(String, boolean)
+ * @see SystemPropertyUtils#resolvePlaceholders(String, boolean)
*/
public static String resolvePlaceholders(String text, ServletContext servletContext) {
return resolvePlaceholders(text, servletContext, false);
@@ -65,13 +65,13 @@ public abstract class ServletContextPropertyUtils {
* servlet context init parameter or system property values. Unresolvable placeholders
* with no default value are ignored and passed through unchanged if the flag is set to true.
* @param text the String to resolve
- * @param servletContext the servletContext to use for lookups.
+ * @param servletContext the servletContext to use for lookups.
* @param ignoreUnresolvablePlaceholders flag to determine is unresolved placeholders are ignored
* @return the resolved String
* @throws IllegalArgumentException if there is an unresolvable placeholder and the flag is false
* @see SystemPropertyUtils#PLACEHOLDER_PREFIX
* @see SystemPropertyUtils#PLACEHOLDER_SUFFIX
- * @see SystemPropertyUtils#resolvePlaceholders(String, boolean)
+ * @see SystemPropertyUtils#resolvePlaceholders(String, boolean)
*/
public static String resolvePlaceholders(String text, ServletContext servletContext,
boolean ignoreUnresolvablePlaceholders) {
@@ -84,20 +84,20 @@ public abstract class ServletContextPropertyUtils {
private static class ServletContextPlaceholderResolver
implements PropertyPlaceholderHelper.PlaceholderResolver {
- private final String text;
+ private final String text;
- private final ServletContext servletContext;
+ private final ServletContext servletContext;
- public ServletContextPlaceholderResolver(String text, ServletContext servletContext) {
- this.text = text;
- this.servletContext = servletContext;
- }
+ public ServletContextPlaceholderResolver(String text, ServletContext servletContext) {
+ this.text = text;
+ this.servletContext = servletContext;
+ }
@Override
@Nullable
public String resolvePlaceholder(String placeholderName) {
- try {
- String propVal = this.servletContext.getInitParameter(placeholderName);
+ try {
+ String propVal = this.servletContext.getInitParameter(placeholderName);
if (propVal == null) {
// Fall back to system properties.
propVal = System.getProperty(placeholderName);
@@ -108,12 +108,12 @@ public abstract class ServletContextPropertyUtils {
}
return propVal;
}
- catch (Throwable ex) {
- System.err.println("Could not resolve placeholder '" + placeholderName + "' in [" +
- this.text + "] as ServletContext init-parameter or system property: " + ex);
- return null;
- }
- }
- }
+ catch (Throwable ex) {
+ System.err.println("Could not resolve placeholder '" + placeholderName + "' in [" +
+ this.text + "] as ServletContext init-parameter or system property: " + ex);
+ return null;
+ }
+ }
+ }
}
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 97ec12d698..01771b9171 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -102,20 +102,20 @@ public class UriTemplate implements Serializable {
return encodedComponents.toUri();
}
- /**
- * Given an array of variables, expand this template into a full URI. The array represent variable values.
- * The order of variables is significant.
- * Example:
- *
- * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
- * System.out.println(template.expand("Rest & Relax", 42));
- *
- * will print: {@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}
- * @param uriVariableValues the array of URI variables
- * @return the expanded URI
- * @throws IllegalArgumentException if {@code uriVariables} is {@code null}
- * or if it does not contain sufficient variables
- */
+ /**
+ * Given an array of variables, expand this template into a full URI. The array represent variable values.
+ * The order of variables is significant.
+ * Example:
+ *
+ * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ * System.out.println(template.expand("Rest & Relax", 42));
+ *
+ * will print: {@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}
+ * @param uriVariableValues the array of URI variables
+ * @return the expanded URI
+ * @throws IllegalArgumentException if {@code uriVariables} is {@code null}
+ * or if it does not contain sufficient variables
+ */
public URI expand(Object... uriVariableValues) {
UriComponents expandedComponents = this.uriComponents.expand(uriVariableValues);
UriComponents encodedComponents = expandedComponents.encode();
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
index 53b5cbd4d5..8aa37a0c64 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java
@@ -107,8 +107,8 @@ class CaptureVariablePathElement extends PathElement {
match = (pathIndex == matchingContext.pathLength);
if (!match && matchingContext.isMatchOptionalTrailingSeparator()) {
match = //(nextPos > candidateIndex) &&
- (pathIndex + 1) == matchingContext.pathLength &&
- matchingContext.isSeparator(pathIndex);
+ (pathIndex + 1) == matchingContext.pathLength &&
+ matchingContext.isSeparator(pathIndex);
}
}
}
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
index c4211a0acf..50dd968121 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java
@@ -75,7 +75,7 @@ class RegexPathElement extends PathElement {
patternBuilder.append(".*");
int pos = matcher.start();
if (pos < 1 || text.charAt(pos-1) != '.') {
- // To be compatible with the AntPathMatcher comparator,
+ // To be compatible with the AntPathMatcher comparator,
// '.*' is not considered a wildcard usage
this.wildcardCount++;
}
@@ -129,13 +129,13 @@ class RegexPathElement extends PathElement {
@Override
public boolean matches(int pathIndex, MatchingContext matchingContext) {
- String textToMatch = matchingContext.pathElementValue(pathIndex);
+ String textToMatch = matchingContext.pathElementValue(pathIndex);
Matcher matcher = this.pattern.matcher(textToMatch);
boolean matches = matcher.matches();
if (matches) {
if (isNoMorePattern()) {
- if (matchingContext.determineRemainingPath &&
+ if (matchingContext.determineRemainingPath &&
(this.variableNames.isEmpty() ? true : textToMatch.length() > 0)) {
matchingContext.remainingPathIndex = pathIndex + 1;
matches = true;
@@ -143,12 +143,13 @@ class RegexPathElement extends PathElement {
else {
// No more pattern, is there more data?
// If pattern is capturing variables there must be some actual data to bind to them
- matches = (pathIndex + 1) >= matchingContext.pathLength &&
- (this.variableNames.isEmpty() || textToMatch.length() > 0);
+ matches = (pathIndex + 1) >= matchingContext.pathLength
+ && (this.variableNames.isEmpty() || textToMatch.length() > 0);
if (!matches && matchingContext.isMatchOptionalTrailingSeparator()) {
- matches = (this.variableNames.isEmpty() || textToMatch.length() > 0) &&
- (pathIndex + 2) >= matchingContext.pathLength &&
- matchingContext.isSeparator(pathIndex + 1);
+ matches = (this.variableNames.isEmpty()
+ || textToMatch.length() > 0)
+ && (pathIndex + 2) >= matchingContext.pathLength
+ && matchingContext.isSeparator(pathIndex + 1);
}
}
}
@@ -176,7 +177,7 @@ class RegexPathElement extends PathElement {
}
return matches;
}
-
+
@Override
public int getNormalizedLength() {
int varsLength = 0;
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
index 48a0535d74..6348866249 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -65,7 +65,7 @@ class SeparatorPathElement extends PathElement {
public String toString() {
return "Separator(" + this.separator + ")";
}
-
+
public char[] getChars() {
return new char[] {this.separator};
}
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
index 800df60cf2..c08c06061b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java
@@ -73,7 +73,7 @@ class SingleCharWildcardedPathElement extends PathElement {
// Not enough data to match this path element
return false;
}
-
+
char[] data = ((PathSegment)element).valueToMatchAsChars();
if (this.caseSensitive) {
for (int i = 0; i < this.len; i++) {
@@ -92,7 +92,7 @@ class SingleCharWildcardedPathElement extends PathElement {
}
}
}
-
+
pathIndex++;
if (isNoMorePattern()) {
if (matchingContext.determineRemainingPath) {
@@ -129,7 +129,7 @@ class SingleCharWildcardedPathElement extends PathElement {
public String toString() {
return "SingleCharWildcarded(" + String.valueOf(this.text) + ")";
}
-
+
@Override
public char[] getChars() {
return this.text;
diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
index f267b4a6e2..702408f202 100644
--- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
+++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -22,7 +22,7 @@ import org.springframework.web.util.pattern.PathPattern.MatchingContext;
/**
* A wildcard path element. In the pattern '/foo/*/goo' the * is
- * represented by a WildcardPathElement. Within a path it matches at least
+ * represented by a WildcardPathElement. Within a path it matches at least
* one character but at the end of a path it can match zero characters.
*
* @author Andy Clement
@@ -36,7 +36,7 @@ class WildcardPathElement extends PathElement {
/**
- * Matching on a WildcardPathElement is quite straight forward. Scan the
+ * Matching on a WildcardPathElement is quite straight forward. Scan the
* candidate from the candidateIndex onwards for the next separator or the end of the
* candidate.
*/
@@ -53,7 +53,7 @@ class WildcardPathElement extends PathElement {
segmentData = ((PathContainer.PathSegment)element).valueToMatch();
pathIndex++;
}
-
+
if (isNoMorePattern()) {
if (matchingContext.determineRemainingPath) {
matchingContext.remainingPathIndex = pathIndex;
@@ -72,7 +72,7 @@ class WildcardPathElement extends PathElement {
}
}
}
- else {
+ else {
// Within a path (e.g. /aa/*/bb) there must be at least one character to match the wildcard
if (segmentData == null || segmentData.length() == 0) {
return false;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
index aa6c56634c..73306ce0c0 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
@@ -64,8 +64,8 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport
public AbstractHandlerMapping() {
- this.patternParser = new PathPatternParser();
- this.globalCorsConfigSource = new UrlBasedCorsConfigurationSource(this.patternParser);
+ this.patternParser = new PathPatternParser();
+ this.globalCorsConfigSource = new UrlBasedCorsConfigurationSource(this.patternParser);
}
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
index 95485b3860..9317dc8cf6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
@@ -42,7 +42,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Jetty {@link WebSocket @WebSocket} handler that delegates events to a
* reactive {@link WebSocketHandler} and its session.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
index 0e16d70e6a..6fdb0a7a52 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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,7 +38,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Spring {@link WebSocketSession} implementation that adapts to a Jetty
* WebSocket {@link org.eclipse.jetty.websocket.api.Session}.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
index 53a6bc819b..e0defe4571 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
@@ -37,7 +37,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Adapter for Java WebSocket API (JSR-356) that delegates events to a reactive
* {@link WebSocketHandler} and its session.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
index 5f5c4fae31..5e52906bbb 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
@@ -38,7 +38,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Spring {@link WebSocketSession} adapter for a standard Java (JSR 356)
* {@link javax.websocket.Session}.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
index 2a78124015..5419ff47ab 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
@@ -29,7 +29,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Spring {@link WebSocketSession} adapter for Tomcat's
* {@link javax.websocket.Session}.
- *
+ *
* @author Violeta Georgieva
* @since 5.0
*/
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
index 232e344b01..d053e0575f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
@@ -36,7 +36,7 @@ import org.springframework.web.reactive.socket.WebSocketMessage.Type;
/**
* Undertow {@link WebSocketConnectionCallback} implementation that adapts and
* delegates to a Spring {@link WebSocketHandler}.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
index 24b36477b0..17bd610c14 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -40,7 +40,7 @@ import org.springframework.web.reactive.socket.WebSocketSession;
/**
* Spring {@link WebSocketSession} implementation that adapts to an Undertow
* {@link io.undertow.websockets.core.WebSocketChannel}.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
index d19231a4cc..df7efca98d 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
@@ -28,7 +28,7 @@ import reactor.core.publisher.MonoProcessor;
/**
* {@link WebSocketClient} implementation for use with the Java WebSocket API.
- *
+ *
* @author Violeta Georgieva
* @since 5.0
*/
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
index 673ad3f91b..bdfa01c877 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
@@ -92,7 +92,7 @@ public class UndertowWebSocketClient extends WebSocketClientSupport implements W
* @since 5.0.8
*/
public UndertowWebSocketClient(XnioWorker worker, ByteBufferPool byteBufferPool,
- Consumer builderConsumer) {
+ Consumer builderConsumer) {
Assert.notNull(worker, "XnioWorker must not be null");
Assert.notNull(byteBufferPool, "ByteBufferPool must not be null");
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
index 03a8898956..c14761bf2b 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
@@ -45,7 +45,7 @@ import org.springframework.web.server.ServerWebExchange;
/**
* A {@link RequestUpgradeStrategy} for use with Jetty.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
index fc940e1434..1928089e33 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
@@ -44,7 +44,7 @@ import org.springframework.web.server.ServerWebExchange;
/**
* A {@link RequestUpgradeStrategy} for use with Undertow.
- *
+ *
* @author Violeta Georgieva
* @author Rossen Stoyanchev
* @since 5.0
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
index 74747095a9..93567a2048 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
@@ -214,7 +214,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser {
else {
cacheControl = CacheControl.empty();
}
-
+
if ("true".equals(element.getAttribute("must-revalidate"))) {
cacheControl = cacheControl.mustRevalidate();
}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
index 4b2ec7635a..eee3b9a4e2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
@@ -50,7 +50,7 @@ public class ViewMethodReturnValueHandler implements HandlerMethodReturnValueHan
public void handleReturnValue(@Nullable Object returnValue, MethodParameter returnType,
ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
- if (returnValue instanceof View){
+ if (returnValue instanceof View){
View view = (View) returnValue;
mavContainer.setView(view);
if (view instanceof SmartView && ((SmartView) view).isRedirectView()) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index ac5945b8d3..34126fbf95 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -465,7 +465,7 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
protected ModelAndView handleMethodArgumentNotValidException(MethodArgumentNotValidException ex,
HttpServletRequest request, HttpServletResponse response, @Nullable Object handler) throws IOException {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return new ModelAndView();
}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index 7ee524ed9c..220df1f46b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -78,7 +78,7 @@ import org.springframework.web.servlet.support.BindStatus;
*
*
*
- *
+ *
* @author Rod Johnson
* @author Juergen Hoeller
* @see #setPath
@@ -131,14 +131,14 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag {
* Default is to not ignore.
*/
public void setIgnoreNestedPath(boolean ignoreNestedPath) {
- this.ignoreNestedPath = ignoreNestedPath;
+ this.ignoreNestedPath = ignoreNestedPath;
}
/**
* Return whether to ignore a nested path, if any.
*/
public boolean isIgnoreNestedPath() {
- return this.ignoreNestedPath;
+ return this.ignoreNestedPath;
}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
index 9350781b91..1db8a49c12 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
@@ -83,7 +83,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
@Nullable
private Set exposedContextBeanNames;
-
+
@Nullable
private String beanName;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
index 25e5659701..5113315065 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
@@ -346,7 +346,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
targetUrl = replaceUriTemplateVariables(targetUrl.toString(), model, variables, enc);
}
if (isPropagateQueryProperties()) {
- appendCurrentQueryParams(targetUrl, request);
+ appendCurrentQueryParams(targetUrl, request);
}
if (this.exposeModelAttributes) {
appendQueryProperties(targetUrl, model, enc);
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
index 4506eaa86a..1cae4f4f29 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
@@ -180,8 +180,8 @@ public class StandardWebSocketClient extends AbstractWebSocketClient {
private int getPort(URI uri) {
if (uri.getPort() == -1) {
- String scheme = uri.getScheme().toLowerCase(Locale.ENGLISH);
- return ("wss".equals(scheme) ? 443 : 80);
+ String scheme = uri.getScheme().toLowerCase(Locale.ENGLISH);
+ return ("wss".equals(scheme) ? 443 : 80);
}
return uri.getPort();
}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
index 393db177d2..725d7d5fb5 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
@@ -422,17 +422,17 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif
Assert.state(getTaskScheduler() != null, "No TaskScheduler configured");
this.lastWriteTime = System.currentTimeMillis();
this.inactivityTasks.add(getTaskScheduler().scheduleWithFixedDelay(() -> {
- if (System.currentTimeMillis() - this.lastWriteTime > duration) {
- try {
- runnable.run();
- }
- catch (Throwable ex) {
- if (logger.isDebugEnabled()) {
- logger.debug("WriteInactivityTask failure", ex);
- }
- }
- }
- }, duration / 2));
+ if (System.currentTimeMillis() - this.lastWriteTime > duration) {
+ try {
+ runnable.run();
+ }
+ catch (Throwable ex) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("WriteInactivityTask failure", ex);
+ }
+ }
+ }
+ }, duration / 2));
}
@Override
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
index 7101068136..5f8f04ef32 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
@@ -118,12 +118,12 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
this.factory = new WebSocketServerFactory(this.servletContext, this.policy);
}
this.factory.setCreator((request, response) -> {
- WebSocketHandlerContainer container = containerHolder.get();
- Assert.state(container != null, "Expected WebSocketHandlerContainer");
- response.setAcceptedSubProtocol(container.getSelectedProtocol());
- response.setExtensions(container.getExtensionConfigs());
- return container.getHandler();
- });
+ WebSocketHandlerContainer container = containerHolder.get();
+ Assert.state(container != null, "Expected WebSocketHandlerContainer");
+ response.setAcceptedSubProtocol(container.getSelectedProtocol());
+ response.setExtensions(container.getExtensionConfigs());
+ return container.getHandler();
+ });
this.factory.start();
}
catch (Throwable ex) {
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java
index 8554907540..bb1d2db26e 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2017 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.
@@ -37,9 +37,9 @@ public abstract class AbstractSockJsMessageCodec implements SockJsMessageCodec {
char[] quotedChars = applyJsonQuoting(messages[i]);
sb.append(escapeSockJsSpecialChars(quotedChars));
sb.append('"');
- if (i < messages.length - 1) {
- sb.append(',');
- }
+ if (i < messages.length - 1) {
+ sb.append(',');
+ }
}
sb.append(']');
return sb.toString();
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index e13848e1a0..c4084acaf1 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -576,21 +576,21 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
private static final String IFRAME_CONTENT =
"\n" +
- "\n" +
- "\n" +
- " Don't panic! \n" +
- " This is a SockJS hidden iframe. It's used for cross domain magic.
\n" +
- "\n" +
- "";
+ "\n" +
+ "\n" +
+ " Don't panic! \n" +
+ " This is a SockJS hidden iframe. It's used for cross domain magic.
\n" +
+ "\n" +
+ "";
@Override
public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException {