From d5f358c33c6cd782084eb4d2ec1ae84ab078da2a Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sun, 25 Feb 2018 09:11:42 +0100 Subject: [PATCH] Polish: Array designators "[]" should be on the type, not the variable (cherry picked from commit c782075) --- .../org/springframework/beans/PropertyDescriptorUtils.java | 6 +++--- .../java/org/springframework/beans/PropertyMatches.java | 2 +- .../beans/factory/support/ConstructorResolver.java | 6 +++--- .../context/support/AbstractApplicationContext.java | 4 ++-- .../src/main/java/org/springframework/util/DigestUtils.java | 2 +- .../src/main/java/org/springframework/util/StreamUtils.java | 2 +- .../org/springframework/util/xml/AbstractStaxHandler.java | 2 +- .../org/springframework/util/xml/DomContentHandler.java | 4 ++-- .../springframework/expression/spel/standard/Tokenizer.java | 2 +- .../springframework/jdbc/support/lob/PassThroughBlob.java | 2 +- .../java/org/springframework/mock/web/MockBodyContent.java | 2 +- .../springframework/mock/web/MockHttpServletResponse.java | 2 +- .../java/org/springframework/mock/web/MockJspWriter.java | 2 +- .../test/web/servlet/setup/StubWebApplicationContext.java | 6 +++--- .../web/util/ContentCachingResponseWrapper.java | 2 +- .../main/java/org/springframework/web/util/WebUtils.java | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java index 5e766690afa..f90d718a05b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java @@ -75,7 +75,7 @@ class PropertyDescriptorUtils { } if (writeMethod != null) { - Class params[] = writeMethod.getParameterTypes(); + Class[] params = writeMethod.getParameterTypes(); if (params.length != 1) { throw new IntrospectionException("Bad write method arg count: " + writeMethod); } @@ -109,7 +109,7 @@ class PropertyDescriptorUtils { Class indexedPropertyType = null; if (indexedReadMethod != null) { - Class params[] = indexedReadMethod.getParameterTypes(); + Class[] params = indexedReadMethod.getParameterTypes(); if (params.length != 1) { throw new IntrospectionException("Bad indexed read method arg count: " + indexedReadMethod); } @@ -123,7 +123,7 @@ class PropertyDescriptorUtils { } if (indexedWriteMethod != null) { - Class params[] = indexedWriteMethod.getParameterTypes(); + Class[] params = indexedWriteMethod.getParameterTypes(); if (params.length != 2) { throw new IntrospectionException("Bad indexed write method arg count: " + indexedWriteMethod); } diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java index f0d607a1cdc..8a9404cdf37 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java @@ -156,7 +156,7 @@ public abstract class PropertyMatches { if (s2.isEmpty()) { return s1.length(); } - int d[][] = new int[s1.length() + 1][s2.length() + 1]; + int[][] d = new int[s1.length() + 1][s2.length() + 1]; for (int i = 0; i <= s1.length(); i++) { d[i][0] = i; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java index 7c871d467e8..aa485efc713 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java @@ -855,11 +855,11 @@ class ConstructorResolver { */ private static class ArgumentsHolder { - public final Object rawArguments[]; + public final Object[] rawArguments; - public final Object arguments[]; + public final Object[] arguments; - public final Object preparedArguments[]; + public final Object[] preparedArguments; public boolean resolveNecessary = false; diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 587e884c9aa..94f0c801095 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -1249,12 +1249,12 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader //--------------------------------------------------------------------- @Override - public String getMessage(String code, Object args[], String defaultMessage, Locale locale) { + public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) { return getMessageSource().getMessage(code, args, defaultMessage, locale); } @Override - public String getMessage(String code, Object args[], Locale locale) throws NoSuchMessageException { + public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException { return getMessageSource().getMessage(code, args, locale); } diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java index 36b1a583c8a..cc782565858 100644 --- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java +++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java @@ -169,7 +169,7 @@ public abstract class DigestUtils { } private static char[] encodeHex(byte[] bytes) { - char chars[] = new char[32]; + char[] chars = new char[32]; for (int i = 0; i < chars.length; i = i + 2) { byte b = bytes[i / 2]; chars[i] = HEX_CHARS[(b >>> 0x4) & 0xf]; diff --git a/spring-core/src/main/java/org/springframework/util/StreamUtils.java b/spring-core/src/main/java/org/springframework/util/StreamUtils.java index d3374bc3ed8..8feb0f4efa9 100644 --- a/spring-core/src/main/java/org/springframework/util/StreamUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StreamUtils.java @@ -165,7 +165,7 @@ public abstract class StreamUtils { } long bytesToCopy = end - start + 1; - byte buffer[] = new byte[StreamUtils.BUFFER_SIZE]; + byte[] buffer = new byte[StreamUtils.BUFFER_SIZE]; while (bytesToCopy > 0) { int bytesRead = in.read(buffer); if (bytesRead == -1) { diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java index e42948438fa..dbc0b700269 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java @@ -100,7 +100,7 @@ abstract class AbstractStaxHandler implements ContentHandler, LexicalHandler { } @Override - public final void characters(char ch[], int start, int length) throws SAXException { + public final void characters(char[] ch, int start, int length) throws SAXException { try { String data = new String(ch, start, length); if (!this.inCData) { diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java index 5a8d92aa850..e7987ce04f3 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java @@ -94,7 +94,7 @@ class DomContentHandler implements ContentHandler { } @Override - public void characters(char ch[], int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) throws SAXException { String data = new String(ch, start, length); Node parent = getParent(); Node lastChild = parent.getLastChild(); @@ -139,7 +139,7 @@ class DomContentHandler implements ContentHandler { } @Override - public void ignorableWhitespace(char ch[], int start, int length) throws SAXException { + public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { } @Override diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java index c60a037fc0d..bcd7ea7806f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java @@ -38,7 +38,7 @@ class Tokenizer { private static final String[] ALTERNATIVE_OPERATOR_NAMES = {"DIV", "EQ", "GE", "GT", "LE", "LT", "MOD", "NE", "NOT"}; - private static final byte FLAGS[] = new byte[256]; + private static final byte[] FLAGS = new byte[256]; private static final byte IS_DIGIT = 0x01; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java index d55a0fd5c28..74cb7ac9825 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java @@ -86,7 +86,7 @@ class PassThroughBlob implements Blob { } @Override - public long position(byte pattern[], long start) throws SQLException { + public long position(byte[] pattern, long start) throws SQLException { throw new UnsupportedOperationException(); } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java index 3b98e2edb5f..2b9adf883a4 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java @@ -123,7 +123,7 @@ public class MockBodyContent extends BodyContent { } @Override - public void write(char value[], int offset, int length) throws IOException { + public void write(char[] value, int offset, int length) throws IOException { getEnclosingWriter().write(value, offset, length); } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index 9983ff797b0..b8034a3d352 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -687,7 +687,7 @@ public class MockHttpServletResponse implements HttpServletResponse { } @Override - public void write(char buf[], int off, int len) { + public void write(char[] buf, int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java index 9fc585e59af..52c4183a476 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java @@ -115,7 +115,7 @@ public class MockJspWriter extends JspWriter { } @Override - public void write(char value[], int offset, int length) throws IOException { + public void write(char[] value, int offset, int length) throws IOException { getTargetWriter().write(value, offset, length); } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java index 972515686a0..d2912c59a68 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -302,12 +302,12 @@ class StubWebApplicationContext implements WebApplicationContext { //--------------------------------------------------------------------- @Override - public String getMessage(String code, Object args[], String defaultMessage, Locale locale) { + public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) { return this.messageSource.getMessage(code, args, defaultMessage, locale); } @Override - public String getMessage(String code, Object args[], Locale locale) throws NoSuchMessageException { + public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException { return this.messageSource.getMessage(code, args, locale); } diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java index 214b97ad4d0..0c1361536fb 100644 --- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java @@ -247,7 +247,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper { } @Override - public void write(char buf[], int off, int len) { + public void write(char[] buf, int off, int len) { super.write(buf, off, len); super.flush(); } diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java index 62275e94dbf..1bf09c6a524 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java @@ -548,7 +548,7 @@ public abstract class WebUtils { */ public static Cookie getCookie(HttpServletRequest request, String name) { Assert.notNull(request, "Request must not be null"); - Cookie cookies[] = request.getCookies(); + Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { if (name.equals(cookie.getName())) {