Skip to content

Commit 5d751be

Browse files
Update switch expression to if statements due to checkstyle defect
1 parent cb96e2d commit 5d751be

1 file changed

Lines changed: 31 additions & 28 deletions

File tree

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationValueQuantityMapper.java

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -80,35 +80,38 @@ public static String processQuantity(Quantity valueQuantity) {
8080
}
8181

8282
private static String prepareQuantityValueWithoutComparator(Quantity valueQuantity) {
83-
return switch (valueQuantity) {
84-
case Quantity vq when UNITS_OF_MEASURE_SYSTEM.equals(vq.getSystem()) && vq.hasCode() ->
85-
PQ_WITH_UOM_SYSTEM_AND_CODE_TEMPLATE.formatted(
86-
valueQuantity.getValue(),
87-
valueQuantity.getCode()
88-
);
89-
case Quantity vq when vq.hasSystem() && vq.hasCode() && vq.hasUnit() ->
90-
PQ_WITH_NON_UOM_SYSTEM_AND_CODE_AND_UNIT_TEMPLATE.formatted(
91-
vq.getValue(),
92-
vq.getValue(),
93-
vq.getCode(),
94-
vq.getSystem(),
95-
vq.getUnit()
96-
);
97-
case Quantity vq when vq.hasSystem() && vq.hasCode() ->
98-
PQ_WITH_NON_UOM_SYSTEM_AND_CODE_TEMPLATE.formatted(
99-
vq.getValue(),
100-
vq.getValue(),
101-
vq.getCode(),
102-
vq.getSystem()
83+
if (UNITS_OF_MEASURE_SYSTEM.equals(valueQuantity.getSystem()) && valueQuantity.hasCode()) {
84+
return PQ_WITH_UOM_SYSTEM_AND_CODE_TEMPLATE.formatted(
85+
valueQuantity.getValue(),
86+
valueQuantity.getCode()
10387
);
104-
case Quantity vq when vq.hasSystem() && vq.hasUnit() ->
105-
PQ_WITH_ANY_SYSTEM_AND_UNIT_TEMPLATE.formatted(
106-
vq.getValue(),
107-
vq.getValue(),
108-
vq.getUnit()
109-
);
110-
default -> PQ_WITH_ONLY_VALUE_TEMPLATE.formatted(valueQuantity.getValue());
111-
};
88+
}
89+
if (valueQuantity.hasSystem() && valueQuantity.hasCode() && valueQuantity.hasUnit()) {
90+
return PQ_WITH_NON_UOM_SYSTEM_AND_CODE_AND_UNIT_TEMPLATE.formatted(
91+
valueQuantity.getValue(),
92+
valueQuantity.getValue(),
93+
valueQuantity.getCode(),
94+
valueQuantity.getSystem(),
95+
valueQuantity.getUnit()
96+
);
97+
}
98+
if (valueQuantity.hasSystem() && valueQuantity.hasCode()) {
99+
return PQ_WITH_NON_UOM_SYSTEM_AND_CODE_TEMPLATE.formatted(
100+
valueQuantity.getValue(),
101+
valueQuantity.getValue(),
102+
valueQuantity.getCode(),
103+
valueQuantity.getSystem()
104+
);
105+
}
106+
if (valueQuantity.hasSystem() && valueQuantity.hasUnit()) {
107+
return PQ_WITH_ANY_SYSTEM_AND_UNIT_TEMPLATE.formatted(
108+
valueQuantity.getValue(),
109+
valueQuantity.getValue(),
110+
valueQuantity.getUnit()
111+
);
112+
}
113+
114+
return PQ_WITH_ONLY_VALUE_TEMPLATE.formatted(valueQuantity.getValue());
112115
}
113116

114117
private static String prepareUnit(Quantity valueQuantity) {

0 commit comments

Comments
 (0)