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

Merge branch '5.2.x'

This commit is contained in:
Stephane Nicoll 2020-09-02 14:44:22 +02:00
parent a06deac5db c2363a6ef9
commit f55b48f4b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/util/unit/DataSize.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.util.unit; package org.springframework.util.unit;
import java.io.Serializable;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -48,7 +49,8 @@ import org.springframework.util.StringUtils;
* @since 5.1 * @since 5.1
* @see DataUnit * @see DataUnit
*/ */
public final class DataSize implements Comparable<DataSize> { @SuppressWarnings("serial")
public final class DataSize implements Comparable<DataSize>, Serializable {
/** /**
* The pattern for parsing. * The pattern for parsing.