github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-29 21:51:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added more duration unit short names for hour, minute and second."

Browse Source 
This reverts commit ebb526304e.
This commit is contained in:
Alex Wei 2014-08-11 18:31:14 +10:00
parent ebb526304e
commit c8cab8c79e
3 changed files with 4 additions and 10 deletions
config/src
main/java/com/typesafe/config/impl
SimpleConfig.java
test
resources
test01.conf
scala/com/typesafe/config/impl
ConfigTest.scala

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

@ -521,11 +521,11 @@ final class SimpleConfig implements Config, MergeableValue, Serializable {
units = TimeUnit.NANOSECONDS;
} else if (unitString.equals("d") || unitString.equals("days")) {
units = TimeUnit.DAYS;
} else if (unitString.equals("h") || unitString.equals("hours") || unitString.equals("hr") || unitString.equals("hrs")) {
} else if (unitString.equals("h") || unitString.equals("hours")) {
units = TimeUnit.HOURS;
} else if (unitString.equals("s") || unitString.equals("seconds") || unitString.equals("secs")) {
} else if (unitString.equals("s") || unitString.equals("seconds")) {
units = TimeUnit.SECONDS;
} else if (unitString.equals("m") || unitString.equals("minutes") || unitString.equals("mins")) {
} else if (unitString.equals("m") || unitString.equals("minutes")) {
units = TimeUnit.MINUTES;
} else {
throw new ConfigException.BadValue(originForException,

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

@ -56,10 +56,7 @@
"secondAsNumber" : 1000,
"halfSecond" : 0.5s,
"millis" : 1 milli,
"micros" : 2000 micros,
"secs" : 2 sec,
"mins" : 1 min,
"hrs" : 1 hr
"micros" : 2000 micros
},
"memsizes" : {

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

@ -771,9 +771,6 @@ class ConfigTest extends TestUtils {
assertEquals(ms2unit(500L), conf.getDuration("durations.halfSecond", unit))
assertEquals(ms2unit(1L), conf.getDuration("durations.millis", unit))
assertEquals(ms2unit(2L), conf.getDuration("durations.micros", unit))
assertEquals(ms2unit(2000L), conf.getDuration("durations.secs", unit))
assertEquals(ms2unit(60000L), conf.getDuration("durations.mins", unit))
assertEquals(ms2unit(3600000L), conf.getDuration("durations.hrs", unit))
}
assertDurationAsTimeUnit(NANOSECONDS)