root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Apply eclipse formatting rules

This commit is contained in:
Phillip Webb 2014-09-04 09:39:58 -07:00
parent 990213b8b8
commit eaa3bd040d
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,14 +115,15 @@ class ProjectLibraries implements Libraries {
return libraries; return libraries;
} }
private Set<GradleLibrary> getLibrariesForFileDependencies(Configuration configuration, private Set<GradleLibrary> getLibrariesForFileDependencies(
LibraryScope scope) { Configuration configuration, LibraryScope scope) {
Set<GradleLibrary> libraries = new LinkedHashSet<GradleLibrary>(); Set<GradleLibrary> libraries = new LinkedHashSet<GradleLibrary>();
for (Dependency dependency : configuration.getIncoming().getDependencies()) { for (Dependency dependency : configuration.getIncoming().getDependencies()) {
if (dependency instanceof FileCollectionDependency) { if (dependency instanceof FileCollectionDependency) {
FileCollectionDependency fileDependency = (FileCollectionDependency) dependency; FileCollectionDependency fileDependency = (FileCollectionDependency) dependency;
for (File file : fileDependency.resolve()) { for (File file : fileDependency.resolve()) {
libraries.add(new GradleLibrary(fileDependency.getGroup(), file, scope)); libraries.add(new GradleLibrary(fileDependency.getGroup(), file,
scope));
} }
} }
else if (dependency instanceof ProjectDependency) { else if (dependency instanceof ProjectDependency) {
@ -134,7 +135,8 @@ class ProjectLibraries implements Libraries {
return libraries; return libraries;
} }
private Set<GradleLibrary> minus(Set<GradleLibrary> source, Set<GradleLibrary> toRemove) { private Set<GradleLibrary> minus(Set<GradleLibrary> source,
Set<GradleLibrary> toRemove) {
if (source == null || toRemove == null) { if (source == null || toRemove == null) {
return source; return source;
} }
@ -191,7 +193,7 @@ class ProjectLibraries implements Libraries {
@Override @Override
public String getName() { public String getName() {
String name = super.getName(); String name = super.getName();
if(this.includeGroupName && this.group != null) { if (this.includeGroupName && this.group != null) {
name = this.group + "-" + name; name = this.group + "-" + name;
} }
return name; return name;

10
spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
View File

@ -16,11 +16,6 @@
package org.springframework.boot.bind; package org.springframework.boot.bind;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
@ -34,6 +29,11 @@ import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
/** /**
* Tests for {@link RelaxedPropertyResolver}. * Tests for {@link RelaxedPropertyResolver}.
* *