Format with Eclipse Oxygen SR2

This commit is contained in:
Phillip Webb
2018-02-08 15:46:49 -08:00
parent 1f8bc391ce
commit 798522d890
62 changed files with 138 additions and 144 deletions

View File

@@ -52,8 +52,8 @@ import java.util.List;
* Each stringer may be used to encode a single top level value. Instances of this class
* are not thread safe. Although this class is nonfinal, it was not designed for
* inheritance and should not be subclassed. In particular, self-use by overrideable
* methods is not specified. See <i>Effective Java</i> Item 17,
* "Design and Document or inheritance or else prohibit it" for further information.
* methods is not specified. See <i>Effective Java</i> Item 17, "Design and Document or
* inheritance or else prohibit it" for further information.
*/
public class JSONStringer {

View File

@@ -54,8 +54,8 @@ package org.springframework.boot.configurationprocessor.json;
* Each tokener may be used to parse a single JSON string. Instances of this class are not
* thread safe. Although this class is nonfinal, it was not designed for inheritance and
* should not be subclassed. In particular, self-use by overrideable methods is not
* specified. See <i>Effective Java</i> Item 17,
* "Design and Document or inheritance or else prohibit it" for further information.
* specified. See <i>Effective Java</i> Item 17, "Design and Document or inheritance or
* else prohibit it" for further information.
*/
public class JSONTokener {

View File

@@ -380,18 +380,14 @@ public class ConfigurationMetadataAnnotationProcessorTests {
ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class);
assertThat(metadata).has(Metadata.withGroup("nestedChildProps")
.fromSource(ClassWithNestedProperties.NestedChildClass.class));
assertThat(metadata)
.has(Metadata
.withProperty("nestedChildProps.child-class-property",
Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class)
.withDefaultValue(20));
assertThat(metadata)
.has(Metadata
.withProperty("nestedChildProps.parent-class-property",
Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class)
.withDefaultValue(10));
assertThat(metadata).has(Metadata
.withProperty("nestedChildProps.child-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class)
.withDefaultValue(20));
assertThat(metadata).has(Metadata
.withProperty("nestedChildProps.parent-class-property", Integer.class)
.fromSource(ClassWithNestedProperties.NestedChildClass.class)
.withDefaultValue(10));
}
@Test

View File

@@ -61,7 +61,7 @@ public class JsonMarshallerTests {
new ItemHint.ValueProvider("first",
Collections.<String, Object>singletonMap("target",
"foo")),
new ItemHint.ValueProvider("second", null))));
new ItemHint.ValueProvider("second", null))));
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
JsonMarshaller marshaller = new JsonMarshaller();
marshaller.write(metadata, outputStream);

View File

@@ -320,7 +320,8 @@ public class SpringBootPluginExtension {
* Module Layout.
* @deprecated as of 1.5 in favor of a custom {@link LayoutFactory}
*/
@Deprecated MODULE(new Layouts.Module()),
@Deprecated
MODULE(new Layouts.Module()),
/**
* No layout.

View File

@@ -273,7 +273,7 @@ public class Repackager {
private void repackage(JarFile sourceJar, JarWriter writer,
final List<Library> unpackLibraries, final List<Library> standardLibraries)
throws IOException {
throws IOException {
writer.writeManifest(buildManifest(sourceJar));
Set<String> seen = new HashSet<String>();
writeNestedLibraries(unpackLibraries, seen, writer);

View File

@@ -64,8 +64,8 @@ public class RandomAccessDataFile implements RandomAccessData {
throw new IllegalArgumentException("File must not be null");
}
if (!file.exists()) {
throw new IllegalArgumentException(String.format(
"File %s must exist", file.getAbsolutePath()));
throw new IllegalArgumentException(
String.format("File %s must exist", file.getAbsolutePath()));
}
this.file = file;
this.filePool = new FilePool(file, concurrentReads);

View File

@@ -108,7 +108,7 @@ public class JarFile extends java.util.jar.JarFile {
private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
RandomAccessData data, JarEntryFilter filter, JarFileType type)
throws IOException {
throws IOException {
super(rootFile.getFile());
this.rootFile = rootFile;
this.pathFromRoot = pathFromRoot;

View File

@@ -125,11 +125,9 @@ public class JarFileArchiveTests {
File nested = new File(this.archive
.getNestedArchive(getEntriesMap(this.archive).get("nested.jar")).getUrl()
.toURI());
File anotherNested = new File(
this.archive
.getNestedArchive(
getEntriesMap(this.archive).get("another-nested.jar"))
.getUrl().toURI());
File anotherNested = new File(this.archive
.getNestedArchive(getEntriesMap(this.archive).get("another-nested.jar"))
.getUrl().toURI());
assertThat(nested.getParent()).isEqualTo(anotherNested.getParent());
}

View File

@@ -355,7 +355,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
* Module Layout.
* @deprecated as of 1.5 in favor of a custom {@link LayoutFactory}
*/
@Deprecated MODULE(new Layouts.Module()),
@Deprecated
MODULE(new Layouts.Module()),
/**
* No Layout.