github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-02-20 00:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #184 from alexwei/master

Browse Source 
Added missing duration unit short names that are supported in scala and more
This commit is contained in:
Havoc Pennington 2014-12-27 13:34:11 -08:00
commit 6c96f2eaa3
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HOCON.md
View File

@ -1200,9 +1200,9 @@ parsed as a number plus an optional unit string.
The supported unit strings for duration are case sensitive and
must be lowercase. Exactly these strings are supported:
- `ns`, `nanosecond`, `nanoseconds`
- `us`, `microsecond`, `microseconds`
- `ms`, `millisecond`, `milliseconds`
- `ns`, `nano`, `nanos`, `nanosecond`, `nanoseconds`
- `us`, `micro`, `micros`, `microsecond`, `microseconds`
- `ms`, `milli`, `millis`, `millisecond`, `milliseconds`
- `s`, `second`, `seconds`
- `m`, `minute`, `minutes`
- `h`, `hour`, `hours`

6
config/src/main/java/com/typesafe/config/impl/SimpleConfig.java
View File

@ -512,12 +512,12 @@ final class SimpleConfig implements Config, MergeableValue, Serializable {
unitString = unitString + "s";
// note that this is deliberately case-sensitive
if (unitString.equals("") || unitString.equals("ms")
if (unitString.equals("") || unitString.equals("ms") || unitString.equals("millis")
|| unitString.equals("milliseconds")) {
units = TimeUnit.MILLISECONDS;
} else if (unitString.equals("us") || unitString.equals("microseconds")) {
} else if (unitString.equals("us") || unitString.equals("micros") || unitString.equals("microseconds")) {
units = TimeUnit.MICROSECONDS;
} else if (unitString.equals("ns") || unitString.equals("nanoseconds")) {
} else if (unitString.equals("ns") || unitString.equals("nanos") || unitString.equals("nanoseconds")) {
units = TimeUnit.NANOSECONDS;
} else if (unitString.equals("d") || unitString.equals("days")) {
units = TimeUnit.DAYS;

4
config/src/test/resources/test01.conf
View File

@ -54,7 +54,9 @@
"second" : 1s,
"secondsList" : [1s,2seconds,3 s, 4000],
"secondAsNumber" : 1000,
"halfSecond" : 0.5s
"halfSecond" : 0.5s,
"millis" : 1 milli,
"micros" : 2000 micros
},
"memsizes" : {

2
config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
View File

@ -769,6 +769,8 @@ class ConfigTest extends TestUtils {
assertEquals(Seq(1, 2, 3, 4) map s2unit,
conf.getDurationList("durations.secondsList", unit).asScala)
assertEquals(ms2unit(500L), conf.getDuration("durations.halfSecond", unit))
assertEquals(ms2unit(1L), conf.getDuration("durations.millis", unit))
assertEquals(ms2unit(2L), conf.getDuration("durations.micros", unit))
}
assertDurationAsTimeUnit(NANOSECONDS)