|
@@ -47,16 +47,19 @@ public class Amount {
|
|
|
@JsonCreator
|
|
@JsonCreator
|
|
|
public Amount(final String serial) {
|
|
public Amount(final String serial) {
|
|
|
final String[] tokens = serial.split(" ", 2);
|
|
final String[] tokens = serial.split(" ", 2);
|
|
|
|
|
+ unit = Unit.COUNT;
|
|
|
value = Double.parseDouble(tokens[0]);
|
|
value = Double.parseDouble(tokens[0]);
|
|
|
final Optional<Volume> rv = Stream.of(Volume.values())
|
|
final Optional<Volume> rv = Stream.of(Volume.values())
|
|
|
.filter(v -> v.displayName.equals(tokens[1])).findFirst();
|
|
.filter(v -> v.displayName.equals(tokens[1])).findFirst();
|
|
|
if (rv.isPresent()) {
|
|
if (rv.isPresent()) {
|
|
|
|
|
+ unit = Unit.VOLUME;
|
|
|
vol = rv.get();
|
|
vol = rv.get();
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
final Optional<Weight> rw = Stream.of(Weight.values())
|
|
final Optional<Weight> rw = Stream.of(Weight.values())
|
|
|
.filter(w -> w.displayName.equals(tokens[1])).findFirst();
|
|
.filter(w -> w.displayName.equals(tokens[1])).findFirst();
|
|
|
if (rw.isPresent()) {
|
|
if (rw.isPresent()) {
|
|
|
|
|
+ unit = Unit.WEIGHT;
|
|
|
wgt = rw.get();
|
|
wgt = rw.get();
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|