Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant modifiers

Browse Source
This commit is contained in:
Phillip Webb
2015-09-08 15:06:44 -07:00
parent 460ca75fce
commit e07df7e4c6
210 changed files with 325 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
View File

@@ -48,7 +48,7 @@ class TypeElementMembers {
private final Map<String, ExecutableElement> publicSetters = new LinkedHashMap<String, ExecutableElement>();
public TypeElementMembers(ProcessingEnvironment env, TypeElement element) {
TypeElementMembers(ProcessingEnvironment env, TypeElement element) {
this.env = env;
process(element);
}

2
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
View File

@@ -32,7 +32,7 @@ class TypeExcludeFilter {
private final Set<String> excludes = new HashSet<String>();
public TypeExcludeFilter() {
TypeExcludeFilter() {
add("com.zaxxer.hikari.IConnectionCustomizer");
add("groovy.text.markup.MarkupTemplateEngine");
add("java.io.Writer");

3
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
View File

@@ -59,7 +59,7 @@ class TypeUtils {
private final TypeMirror mapType;
public TypeUtils(ProcessingEnvironment env) {
TypeUtils(ProcessingEnvironment env) {
this.env = env;
Types types = env.getTypeUtils();
WildcardType wc = types.getWildcardType(null, null);
@@ -67,7 +67,6 @@ class TypeUtils {
.getTypeElement(Collection.class.getName()), wc);
this.mapType = types.getDeclaredType(
this.env.getElementUtils().getTypeElement(Map.class.getName()), wc, wc);
}
public String getType(Element element) {

2
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ExpressionTree.java
View File

@@ -43,7 +43,7 @@ class ExpressionTree extends ReflectionWrapper {
private final Method arrayValueMethod = findMethod(this.newArrayTreeType,
"getInitializers");
public ExpressionTree(Object instance) {
ExpressionTree(Object instance) {
super(instance);
}

4
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ReflectionWrapper.java
View File

@@ -31,12 +31,12 @@ class ReflectionWrapper {
private final Object instance;
public ReflectionWrapper(Object instance) {
ReflectionWrapper(Object instance) {
this.type = instance.getClass();
this.instance = instance;
}
public ReflectionWrapper(String type, Object instance) {
ReflectionWrapper(String type, Object instance) {
this.type = findClass(instance.getClass().getClassLoader(), type);
this.instance = instance;
}

4
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/Tree.java
View File

@@ -36,7 +36,7 @@ class Tree extends ReflectionWrapper {
private final Method GET_CLASS_TREE_MEMBERS = findMethod(
findClass("com.sun.source.tree.ClassTree"), "getMembers");
public Tree(Object instance) {
Tree(Object instance) {
super("com.sun.source.tree.Tree", instance);
}
@@ -53,7 +53,7 @@ class Tree extends ReflectionWrapper {
private TreeVisitor treeVisitor;
public TreeVisitorInvocationHandler(TreeVisitor treeVisitor) {
TreeVisitorInvocationHandler(TreeVisitor treeVisitor) {
this.treeVisitor = treeVisitor;
}

2
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/VariableTree.java
View File

@@ -29,7 +29,7 @@ import javax.lang.model.element.Modifier;
*/
class VariableTree extends ReflectionWrapper {
public VariableTree(Object instance) {
VariableTree(Object instance) {
super(instance);
}

6
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java
View File

@@ -56,7 +56,7 @@ class ProjectLibraries implements Libraries {
* @param project the gradle project
* @param extension the extension
*/
public ProjectLibraries(Project project, SpringBootPluginExtension extension) {
ProjectLibraries(Project project, SpringBootPluginExtension extension) {
this.project = project;
this.extension = extension;
}
@@ -177,7 +177,7 @@ class ProjectLibraries implements Libraries {
private boolean includeGroupName;
public GradleLibrary(String group, File file, LibraryScope scope) {
GradleLibrary(String group, File file, LibraryScope scope) {
super(file, scope);
this.group = group;
}
@@ -221,7 +221,7 @@ class ProjectLibraries implements Libraries {
private final ResolvedArtifact artifact;
public ResolvedArtifactLibrary(ResolvedArtifact artifact, LibraryScope scope) {
ResolvedArtifactLibrary(ResolvedArtifact artifact, LibraryScope scope) {
super(artifact.getModuleVersion().getId().getGroup(), artifact.getFile(),
scope);
this.artifact = artifact;

2
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackagePluginFeatures.java
View File

@@ -112,7 +112,7 @@ public class RepackagePluginFeatures implements PluginFeatures {
private final Project project;
public RegisterInputsOutputsAction(RepackageTask task) {
RegisterInputsOutputsAction(RepackageTask task) {
this.task = task;
this.project = task.getProject();
}

4
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java
View File

@@ -123,7 +123,7 @@ public class RepackageTask extends DefaultTask {
private final ProjectLibraries libraries;
public RepackageAction(SpringBootPluginExtension extension,
RepackageAction(SpringBootPluginExtension extension,
ProjectLibraries libraries) {
this.extension = extension;
this.libraries = libraries;
@@ -238,7 +238,7 @@ public class RepackageTask extends DefaultTask {
*/
private class LoggingRepackager extends Repackager {
public LoggingRepackager(File source) {
LoggingRepackager(File source) {
super(source);
}

6
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
View File

@@ -268,7 +268,7 @@ public class JarWriter {
private final boolean close;
public InputStreamEntryWriter(InputStream inputStream, boolean close) {
InputStreamEntryWriter(InputStream inputStream, boolean close) {
this.inputStream = inputStream;
this.close = close;
}
@@ -346,7 +346,7 @@ public class JarWriter {
private long size;
public CrcAndSize(File file) throws IOException {
CrcAndSize(File file) throws IOException {
FileInputStream inputStream = new FileInputStream(file);
try {
load(inputStream);
@@ -356,7 +356,7 @@ public class JarWriter {
}
}
public CrcAndSize(InputStream inputStream) throws IOException {
CrcAndSize(InputStream inputStream) throws IOException {
load(inputStream);
}

2
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
View File

@@ -279,7 +279,7 @@ public abstract class MainClassFinder {
private boolean found;
public MainMethodFinder() {
MainMethodFinder() {
super(Opcodes.ASM4);
}

2
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
View File

@@ -522,7 +522,7 @@ public class RepackagerTests {
private final byte[] bytes;
public MockLauncherScript(String script) {
MockLauncherScript(String script) {
this.bytes = script.getBytes();
}

4
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
View File

@@ -47,7 +47,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
* @param urls the URLs from which to load classes and resources
* @param parent the parent class loader for delegation
*/
public LaunchedURLClassLoader(URL[] urls, ClassLoader parent) {
LaunchedURLClassLoader(URL[] urls, ClassLoader parent) {
super(urls, parent);
this.rootClassLoader = findRootClassLoader(parent);
}
@@ -253,7 +253,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
private final Enumeration<URL> localResources;
public ResourceEnumeration(Enumeration<URL> rootResources,
ResourceEnumeration(Enumeration<URL> rootResources,
Enumeration<URL> localResources) {
this.rootResources = rootResources;
this.localResources = localResources;

7
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
View File

@@ -174,7 +174,7 @@ public class ExplodedArchive extends Archive {
private final File file;
public FileEntry(AsciiBytes name, File file) {
FileEntry(AsciiBytes name, File file) {
this.name = name;
this.file = file;
}
@@ -199,9 +199,6 @@ public class ExplodedArchive extends Archive {
*/
private class FilteredURLStreamHandler extends URLStreamHandler {
public FilteredURLStreamHandler() {
}
@Override
protected URLConnection openConnection(URL url) throws IOException {
String name = url.getPath().substring(
@@ -220,7 +217,7 @@ public class ExplodedArchive extends Archive {
private final String name;
public FileNotFoundURLConnection(URL url, String name) {
FileNotFoundURLConnection(URL url, String name) {
super(url);
this.name = name;
}

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
View File

@@ -168,7 +168,7 @@ public class JarFileArchive extends Archive {
private final JarEntryData entryData;
public JarFileEntry(JarEntryData entryData) {
JarFileEntry(JarEntryData entryData) {
this.entryData = entryData;
}

4
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
View File

@@ -126,7 +126,7 @@ public class RandomAccessDataFile implements RandomAccessData {
private int position;
public DataInputStream(ResourceAccess access) throws IOException {
DataInputStream(ResourceAccess access) throws IOException {
if (access == ResourceAccess.ONCE) {
this.file = new RandomAccessFile(RandomAccessDataFile.this.file, "r");
this.file.seek(RandomAccessDataFile.this.offset);
@@ -236,7 +236,7 @@ public class RandomAccessDataFile implements RandomAccessData {
private final Queue<RandomAccessFile> files;
public FilePool(int size) {
FilePool(int size) {
this.size = size;
this.available = new Semaphore(size);
this.files = new ConcurrentLinkedQueue<RandomAccessFile>();

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.java
View File

@@ -53,7 +53,7 @@ class CentralDirectoryEndRecord {
* @param data the source data
* @throws IOException
*/
public CentralDirectoryEndRecord(RandomAccessData data) throws IOException {
CentralDirectoryEndRecord(RandomAccessData data) throws IOException {
this.block = createBlockFromEndOfData(data, READ_BLOCK_SIZE);
this.size = MINIMUM_SIZE;
this.offset = this.block.length - this.size;

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
View File

@@ -217,7 +217,7 @@ class JarURLConnection extends java.net.JarURLConnection {
private String contentType;
public JarEntryName(String spec) {
JarEntryName(String spec) {
this.name = decode(spec);
}

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/ZipInflaterInputStream.java
View File

@@ -34,7 +34,7 @@ class ZipInflaterInputStream extends InflaterInputStream {
private int available;
public ZipInflaterInputStream(InputStream inputStream, int size) {
ZipInflaterInputStream(InputStream inputStream, int size) {
super(inputStream, new Inflater(true), getInflaterBufferSize(size));
this.available = size;
}

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/ExecutableArchiveLauncherTests.java
View File

@@ -104,7 +104,7 @@ public class ExecutableArchiveLauncherTests {
private static final class UnitTestExecutableArchiveLauncher extends
ExecutableArchiveLauncher {
public UnitTestExecutableArchiveLauncher(JavaAgentDetector javaAgentDetector) {
UnitTestExecutableArchiveLauncher(JavaAgentDetector javaAgentDetector) {
super(javaAgentDetector);
}

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/OutputCapture.java
View File

@@ -90,7 +90,7 @@ public class OutputCapture implements TestRule {
private final OutputStream copy;
public CaptureOutputStream(PrintStream original, OutputStream copy) {
CaptureOutputStream(PrintStream original, OutputStream copy) {
this.original = original;
this.copy = copy;
}

8
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@@ -289,7 +289,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
}
private final String getStartClass() throws MojoExecutionException {
private String getStartClass() throws MojoExecutionException {
String mainClass = this.mainClass;
if (mainClass == null) {
try {
@@ -368,7 +368,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private static class TestArtifactFilter extends AbstractArtifactFeatureFilter {
public TestArtifactFilter() {
TestArtifactFilter() {
super("", Artifact.SCOPE_TEST);
}
@@ -386,7 +386,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private Throwable exception;
public IsolatedThreadGroup(String name) {
IsolatedThreadGroup(String name) {
super(name);
}
@@ -417,7 +417,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
private final String startClassName;
private final String[] args;
public LaunchRunner(String startClassName, String... args) {
LaunchRunner(String startClassName, String... args) {
this.startClassName = startClassName;
this.args = (args != null ? args : new String[] {});
}

2
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View File

@@ -273,7 +273,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
return this.layout;
}
private LayoutType(Layout layout) {
LayoutType(Layout layout) {
this.layout = layout;
}
}

4
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
View File

@@ -33,11 +33,11 @@ class RunArguments {
private final LinkedList<String> args;
public RunArguments(String arguments) {
RunArguments(String arguments) {
this(parseArgs(arguments));
}
public RunArguments(String[] args) {
RunArguments(String[] args) {
this.args = new LinkedList<String>(Arrays.asList(args));
}

2
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/SpringApplicationAdminClient.java
View File

@@ -46,7 +46,7 @@ class SpringApplicationAdminClient {
private final ObjectName objectName;
public SpringApplicationAdminClient(MBeanServerConnection connection, String jmxName) {
SpringApplicationAdminClient(MBeanServerConnection connection, String jmxName) {
this.connection = connection;
this.objectName = toObjectName(jmxName);
}

2
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
View File

@@ -287,7 +287,7 @@ public class StartMojo extends AbstractRunMojo {
private final int port;
public CreateJmxConnector(int port) {
CreateJmxConnector(int port) {
this.port = port;
}

6
spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
View File

@@ -157,7 +157,7 @@ public final class Verify {
private final File file;
public AbstractArchiveVerification(File file) {
AbstractArchiveVerification(File file) {
this.file = file;
}
@@ -271,7 +271,7 @@ public final class Verify {
private static class ZipArchiveVerification extends AbstractArchiveVerification {
public ZipArchiveVerification(File file) {
ZipArchiveVerification(File file) {
super(file);
}
@@ -287,7 +287,7 @@ public final class Verify {
private static class ModuleArchiveVerification extends AbstractArchiveVerification {
public ModuleArchiveVerification(File file) {
ModuleArchiveVerification(File file) {
super(file);
}