Skip to content

Commit c0e45b7

Browse files
snicollsnicoll
committed
Adapt to Spring Framework API change
1 parent cb7de2a commit c0e45b7

File tree

13 files changed

+52
-52
lines changed

13 files changed

+52
-52
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class ServerProperties {
8585
/**
8686
* Maximum size of the HTTP message header.
8787
*/
88-
private DataSize maxHttpHeaderSize = DataSize.ofKiloBytes(8);
88+
private DataSize maxHttpHeaderSize = DataSize.ofKilobytes(8);
8989

9090
/**
9191
* Time that connectors wait for another HTTP request before closing the connection.
@@ -335,7 +335,7 @@ public static class Tomcat {
335335
/**
336336
* Maximum amount of request body to swallow.
337337
*/
338-
private DataSize maxSwallowSize = DataSize.ofMegaBytes(2);
338+
private DataSize maxSwallowSize = DataSize.ofMegabytes(2);
339339

340340
/**
341341
* Whether requests to the context root should be redirected by appending a / to

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ public class MultipartProperties {
6464
* Max file size.
6565
*/
6666
@DataSizeUnit(DataUnit.MEGABYTES)
67-
private DataSize maxFileSize = DataSize.ofMegaBytes(1);
67+
private DataSize maxFileSize = DataSize.ofMegabytes(1);
6868

6969
/**
7070
* Max request size.
7171
*/
7272
@DataSizeUnit(DataUnit.MEGABYTES)
73-
private DataSize maxRequestSize = DataSize.ofMegaBytes(10);
73+
private DataSize maxRequestSize = DataSize.ofMegabytes(10);
7474

7575
/**
7676
* Threshold after which files are written to disk.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@ public void testCustomizeUriEncoding() {
138138
public void testCustomizeHeaderSize() {
139139
bind("server.max-http-header-size", "1MB");
140140
assertThat(this.properties.getMaxHttpHeaderSize())
141-
.isEqualTo(DataSize.ofMegaBytes(1));
141+
.isEqualTo(DataSize.ofMegabytes(1));
142142
}
143143

144144
@Test
145145
public void testCustomizeHeaderSizeUseBytesByDefault() {
146146
bind("server.max-http-header-size", "1024");
147147
assertThat(this.properties.getMaxHttpHeaderSize())
148-
.isEqualTo(DataSize.ofKiloBytes(1));
148+
.isEqualTo(DataSize.ofKilobytes(1));
149149
}
150150

151151
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void customMaxHttpHeaderSize() {
126126
bind("server.max-http-header-size=1KB");
127127
customizeAndRunServer((server) -> assertThat(((AbstractHttp11Protocol<?>) server
128128
.getTomcat().getConnector().getProtocolHandler()).getMaxHttpHeaderSize())
129-
.isEqualTo(DataSize.ofKiloBytes(1).toBytes()));
129+
.isEqualTo(DataSize.ofKilobytes(1).toBytes()));
130130
}
131131

132132
@Test
@@ -136,15 +136,15 @@ public void customMaxHttpHeaderSizeWithDeprecatedProperty() {
136136
"server.tomcat.max-http-header-size=1024");
137137
customizeAndRunServer((server) -> assertThat(((AbstractHttp11Protocol<?>) server
138138
.getTomcat().getConnector().getProtocolHandler()).getMaxHttpHeaderSize())
139-
.isEqualTo(DataSize.ofKiloBytes(1).toBytes()));
139+
.isEqualTo(DataSize.ofKilobytes(1).toBytes()));
140140
}
141141

142142
@Test
143143
public void customMaxSwallowSize() {
144144
bind("server.tomcat.max-swallow-size=10MB");
145145
customizeAndRunServer((server) -> assertThat(((AbstractHttp11Protocol<?>) server
146146
.getTomcat().getConnector().getProtocolHandler()).getMaxSwallowSize())
147-
.isEqualTo(DataSize.ofMegaBytes(10).toBytes()));
147+
.isEqualTo(DataSize.ofMegabytes(10).toBytes()));
148148
}
149149

150150
@Test

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ protected static class MultipartConfiguration {
213213
@Bean
214214
public MultipartConfigElement multipartConfig() {
215215
MultipartConfigFactory factory = new MultipartConfigFactory();
216-
factory.setMaxFileSize(DataSize.ofKiloBytes(128));
217-
factory.setMaxRequestSize(DataSize.ofKiloBytes(128));
216+
factory.setMaxFileSize(DataSize.ofKilobytes(128));
217+
factory.setMaxRequestSize(DataSize.ofKilobytes(128));
218218
return factory.createMultipartConfig();
219219
}
220220

‎spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/context/properties/bind/AppIoProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class AppIoProperties {
3232

3333
@DataSizeUnit(DataUnit.MEGABYTES)
34-
private DataSize bufferSize = DataSize.ofMegaBytes(2);
34+
private DataSize bufferSize = DataSize.ofMegabytes(2);
3535

3636
private DataSize sizeThreshold = DataSize.ofBytes(512);
3737

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ private static class FieldCollector implements TreeVisitor {
123123
static {
124124
Map<String, String> values = new HashMap<>();
125125
values.put("Bytes", "B");
126-
values.put("KiloBytes", "KB");
127-
values.put("MegaBytes", "MB");
128-
values.put("GigaBytes", "GB");
129-
values.put("TeraBytes", "TB");
126+
values.put("Kilobytes", "KB");
127+
values.put("Megabytes", "MB");
128+
values.put("Gigabytes", "GB");
129+
values.put("Terabytes", "TB");
130130
DATA_SIZE_SUFFIX = Collections.unmodifiableMap(values);
131131
}
132132

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ public void getFieldValues() throws Exception {
9797
assertThat(values.get("durationDays")).isEqualTo("50d");
9898
assertThat(values.get("dataSizeNone")).isNull();
9999
assertThat(values.get("dataSizeBytes")).isEqualTo("5B");
100-
assertThat(values.get("dataSizeKiloBytes")).isEqualTo("10KB");
101-
assertThat(values.get("dataSizeMegaBytes")).isEqualTo("20MB");
102-
assertThat(values.get("dataSizeGigaBytes")).isEqualTo("30GB");
103-
assertThat(values.get("dataSizeTeraBytes")).isEqualTo("40TB");
100+
assertThat(values.get("dataSizeKilobytes")).isEqualTo("10KB");
101+
assertThat(values.get("dataSizeMegabytes")).isEqualTo("20MB");
102+
assertThat(values.get("dataSizeGigabytes")).isEqualTo("30GB");
103+
assertThat(values.get("dataSizeTerabytes")).isEqualTo("40TB");
104104
}
105105

106106
@SupportedAnnotationTypes({

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ public class FieldValues {
128128

129129
private DataSize dataSizeBytes = DataSize.ofBytes(5);
130130

131-
private DataSize dataSizeKiloBytes = DataSize.ofKiloBytes(10);
131+
private DataSize dataSizeKilobytes = DataSize.ofKilobytes(10);
132132

133-
private DataSize dataSizeMegaBytes = DataSize.ofMegaBytes(20);
133+
private DataSize dataSizeMegabytes = DataSize.ofMegabytes(20);
134134

135-
private DataSize dataSizeGigaBytes = DataSize.ofGigaBytes(30);
135+
private DataSize dataSizeGigabytes = DataSize.ofGigabytes(30);
136136

137-
private DataSize dataSizeTeraBytes = DataSize.ofTeraBytes(40);
137+
private DataSize dataSizeTerabytes = DataSize.ofTerabytes(40);
138138

139139
}

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,8 +774,8 @@ public void loadWhenBindingCurrentDirectoryToFileShouldBind() {
774774
public void loadWhenBindingToDataSizeShouldBind() {
775775
load(DataSizeProperties.class, "test.size=10GB", "test.another-size=5");
776776
DataSizeProperties bean = this.context.getBean(DataSizeProperties.class);
777-
assertThat(bean.getSize()).isEqualTo(DataSize.ofGigaBytes(10));
778-
assertThat(bean.getAnotherSize()).isEqualTo(DataSize.ofKiloBytes(5));
777+
assertThat(bean.getSize()).isEqualTo(DataSize.ofGigabytes(10));
778+
assertThat(bean.getAnotherSize()).isEqualTo(DataSize.ofKilobytes(5));
779779
}
780780

781781
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToDataSizeConverterTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public void convertWhenSimpleWithoutSuffixShouldReturnDataSize() {
5656

5757
@Test
5858
public void convertWhenSimpleWithoutSuffixButWithAnnotationShouldReturnDataSize() {
59-
assertThat(convert(10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKiloBytes(10));
60-
assertThat(convert(+10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKiloBytes(10));
61-
assertThat(convert(-10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKiloBytes(-10));
59+
assertThat(convert(10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKilobytes(10));
60+
assertThat(convert(+10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKilobytes(10));
61+
assertThat(convert(-10, DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKilobytes(-10));
6262
}
6363

6464
private DataSize convert(Integer source) {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToDataSizeConverterTests.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,31 +57,31 @@ public void convertWhenSimpleBytesShouldReturnDataSize() {
5757
}
5858

5959
@Test
60-
public void convertWhenSimpleKiloBytesShouldReturnDataSize() {
61-
assertThat(convert("10KB")).isEqualTo(DataSize.ofKiloBytes(10));
62-
assertThat(convert("+10KB")).isEqualTo(DataSize.ofKiloBytes(10));
63-
assertThat(convert("-10KB")).isEqualTo(DataSize.ofKiloBytes(-10));
60+
public void convertWhenSimpleKilobytesShouldReturnDataSize() {
61+
assertThat(convert("10KB")).isEqualTo(DataSize.ofKilobytes(10));
62+
assertThat(convert("+10KB")).isEqualTo(DataSize.ofKilobytes(10));
63+
assertThat(convert("-10KB")).isEqualTo(DataSize.ofKilobytes(-10));
6464
}
6565

6666
@Test
67-
public void convertWhenSimpleMegaBytesShouldReturnDataSize() {
68-
assertThat(convert("10MB")).isEqualTo(DataSize.ofMegaBytes(10));
69-
assertThat(convert("+10MB")).isEqualTo(DataSize.ofMegaBytes(10));
70-
assertThat(convert("-10MB")).isEqualTo(DataSize.ofMegaBytes(-10));
67+
public void convertWhenSimpleMegabytesShouldReturnDataSize() {
68+
assertThat(convert("10MB")).isEqualTo(DataSize.ofMegabytes(10));
69+
assertThat(convert("+10MB")).isEqualTo(DataSize.ofMegabytes(10));
70+
assertThat(convert("-10MB")).isEqualTo(DataSize.ofMegabytes(-10));
7171
}
7272

7373
@Test
74-
public void convertWhenSimpleGigaBytesShouldReturnDataSize() {
75-
assertThat(convert("10GB")).isEqualTo(DataSize.ofGigaBytes(10));
76-
assertThat(convert("+10GB")).isEqualTo(DataSize.ofGigaBytes(10));
77-
assertThat(convert("-10GB")).isEqualTo(DataSize.ofGigaBytes(-10));
74+
public void convertWhenSimpleGigabytesShouldReturnDataSize() {
75+
assertThat(convert("10GB")).isEqualTo(DataSize.ofGigabytes(10));
76+
assertThat(convert("+10GB")).isEqualTo(DataSize.ofGigabytes(10));
77+
assertThat(convert("-10GB")).isEqualTo(DataSize.ofGigabytes(-10));
7878
}
7979

8080
@Test
81-
public void convertWhenSimpleTeraBytesShouldReturnDataSize() {
82-
assertThat(convert("10TB")).isEqualTo(DataSize.ofTeraBytes(10));
83-
assertThat(convert("+10TB")).isEqualTo(DataSize.ofTeraBytes(10));
84-
assertThat(convert("-10TB")).isEqualTo(DataSize.ofTeraBytes(-10));
81+
public void convertWhenSimpleTerabytesShouldReturnDataSize() {
82+
assertThat(convert("10TB")).isEqualTo(DataSize.ofTerabytes(10));
83+
assertThat(convert("+10TB")).isEqualTo(DataSize.ofTerabytes(10));
84+
assertThat(convert("-10TB")).isEqualTo(DataSize.ofTerabytes(-10));
8585
}
8686

8787
@Test
@@ -93,11 +93,11 @@ public void convertWhenSimpleWithoutSuffixShouldReturnDataSize() {
9393

9494
@Test
9595
public void convertWhenSimpleWithoutSuffixButWithAnnotationShouldReturnDataSize() {
96-
assertThat(convert("10", DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKiloBytes(10));
96+
assertThat(convert("10", DataUnit.KILOBYTES)).isEqualTo(DataSize.ofKilobytes(10));
9797
assertThat(convert("+10", DataUnit.KILOBYTES))
98-
.isEqualTo(DataSize.ofKiloBytes(10));
98+
.isEqualTo(DataSize.ofKilobytes(10));
9999
assertThat(convert("-10", DataUnit.KILOBYTES))
100-
.isEqualTo(DataSize.ofKiloBytes(-10));
100+
.isEqualTo(DataSize.ofKilobytes(-10));
101101
}
102102

103103
@Test

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/MultipartConfigFactoryTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public void createWithStringSizes() {
7474
public void createWithDataSizes() {
7575
MultipartConfigFactory factory = new MultipartConfigFactory();
7676
factory.setMaxFileSize(DataSize.ofBytes(1));
77-
factory.setMaxRequestSize(DataSize.ofKiloBytes(2));
78-
factory.setFileSizeThreshold(DataSize.ofMegaBytes(3));
77+
factory.setMaxRequestSize(DataSize.ofKilobytes(2));
78+
factory.setFileSizeThreshold(DataSize.ofMegabytes(3));
7979
MultipartConfigElement config = factory.createMultipartConfig();
8080
assertThat(config.getMaxFileSize()).isEqualTo(1L);
8181
assertThat(config.getMaxRequestSize()).isEqualTo(2 * 1024L);
@@ -86,8 +86,8 @@ public void createWithDataSizes() {
8686
public void createWithNegativeDataSizes() {
8787
MultipartConfigFactory factory = new MultipartConfigFactory();
8888
factory.setMaxFileSize(DataSize.ofBytes(-1));
89-
factory.setMaxRequestSize(DataSize.ofKiloBytes(-2));
90-
factory.setFileSizeThreshold(DataSize.ofMegaBytes(-3));
89+
factory.setMaxRequestSize(DataSize.ofKilobytes(-2));
90+
factory.setFileSizeThreshold(DataSize.ofMegabytes(-3));
9191
MultipartConfigElement config = factory.createMultipartConfig();
9292
assertThat(config.getMaxFileSize()).isEqualTo(-1L);
9393
assertThat(config.getMaxRequestSize()).isEqualTo(-1);

0 commit comments

Comments
 (0)