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

Remove use of @Nullable from copy of SortedProperties 

Rationale: @Nullable is not visible in the spring-context-indexer
project.
This commit is contained in:
Sam Brannen 2019-06-12 15:31:02 +03:00
parent 42c0d8ec7f
commit 8b68400bbe
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context-indexer/src/main/java/org/springframework/context/index/processor/SortedProperties.java
View File

@ -30,8 +30,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import org.springframework.lang.Nullable;
/**
* Specialization of {@link Properties} that sorts properties alphanumerically
* based on their keys.
@ -87,7 +85,7 @@ class SortedProperties extends Properties {
@Override
public void store(OutputStream out, @Nullable String comments) throws IOException {
public void store(OutputStream out, String comments) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
super.store(baos, (this.omitComments ? null : comments));
String contents = new String(baos.toByteArray(), StandardCharsets.ISO_8859_1);
@ -99,7 +97,7 @@ class SortedProperties extends Properties {
}
@Override
public void store(Writer writer, @Nullable String comments) throws IOException {
public void store(Writer writer, String comments) throws IOException {
StringWriter stringWriter = new StringWriter();
super.store(stringWriter, (this.omitComments ? null : comments));
String contents = stringWriter.toString();
@ -111,12 +109,12 @@ class SortedProperties extends Properties {
}
@Override
public void storeToXML(OutputStream out, @Nullable String comments) throws IOException {
public void storeToXML(OutputStream out, String comments) throws IOException {
super.storeToXML(out, (this.omitComments ? null : comments));
}
@Override
public void storeToXML(OutputStream out, @Nullable String comments, String encoding) throws IOException {
public void storeToXML(OutputStream out, String comments, String encoding) throws IOException {
super.storeToXML(out, (this.omitComments ? null : comments), encoding);
}