Skip to content

Commit cfa988b

Browse files
committed
Rename UnitUtil::getUnits to parse
1 parent cb2ebc1 commit cfa988b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

vortex-api/src/main/java/mil/army/usace/hec/vortex/convert/DataConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static List<VortexGrid> convert(List<VortexGrid> vortexGrids) {
4040

4141
public static VortexGrid convert(VortexGrid vortexGrid) {
4242
VortexVariable variable = VortexVariable.fromGrid(vortexGrid);
43-
Unit<?> units = UnitUtil.getUnits(vortexGrid.units());
43+
Unit<?> units = UnitUtil.parse(vortexGrid.units());
4444

4545
if (units == null)
4646
return vortexGrid;

vortex-api/src/main/java/mil/army/usace/hec/vortex/io/GridDatasetReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ private static Grid getGridDefinition(GridCoordSystem coordinateSystem) {
303303
.build());
304304

305305
String xAxisUnits = Objects.requireNonNull(xAxis).getUnitsString();
306-
Unit<?> cellUnits = UnitUtil.getUnits(xAxisUnits.toLowerCase());
306+
Unit<?> cellUnits = UnitUtil.parse(xAxisUnits.toLowerCase());
307307
Unit<?> csUnits = ReferenceUtils.getLinearUnits(wkt);
308308

309309
// This will scale the grid if cellUnits and csUnits do not align

vortex-api/src/main/java/mil/army/usace/hec/vortex/io/VariableDsReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private static Grid getGridDefinition(NetcdfDataset ncd, CoordinateSystem coordi
290290
.build();
291291

292292
String xAxisUnits = Objects.requireNonNull(xAxis).getUnitsString();
293-
Unit<?> cellUnits = UnitUtil.getUnits(xAxisUnits.toLowerCase());
293+
Unit<?> cellUnits = UnitUtil.parse(xAxisUnits.toLowerCase());
294294
Unit<?> csUnits = ReferenceUtils.getLinearUnits(wkt);
295295

296296
if (cellUnits.isCompatible(csUnits) && !cellUnits.equals(csUnits)) {

vortex-api/src/main/java/mil/army/usace/hec/vortex/util/DssUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static GridInfo getGridInfo(VortexGrid grid) {
107107

108108
gridInfo.setCellInfo(minX, minY, grid.nx(), grid.ny(), cellSize);
109109

110-
Unit<?> units = UnitUtil.getUnits(grid.units());
110+
Unit<?> units = UnitUtil.parse(grid.units());
111111
String unitsString = getUnitsString(units);
112112
gridInfo.setDataUnits(unitsString);
113113

vortex-api/src/main/java/mil/army/usace/hec/vortex/util/UnitUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private UnitUtil() {
2424
// Utility Class
2525
}
2626

27-
public static Unit<?> getUnits(String units) {
27+
public static Unit<?> parse(String units) {
2828
if (units == null) {
2929
return ONE;
3030
}

vortex-api/src/test/java/mil/army/usace/hec/vortex/util/UnitUtilTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import javax.measure.Unit;
77

8-
import static org.junit.jupiter.api.Assertions.*;
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
99
import static systems.uom.common.USCustomary.INCH;
1010
import static systems.uom.common.USCustomary.SQUARE_FOOT;
1111

@@ -18,17 +18,17 @@ void unit1divide1000inches() {
1818
Unit<?> units = INCH.divide(1000);
1919
Unit<?> parsed = TransformedUnit.parse("in/1000");
2020

21-
Unit<?> retrieved = UnitUtil.getUnits(str);
21+
Unit<?> retrieved = UnitUtil.parse(str);
2222
assertEquals(units, retrieved);
2323
assertEquals(units, parsed);
2424
}
2525

2626
@Test
2727
void unitSquareFeet() {
2828
String ft2 = "ft2";
29-
assertEquals(SQUARE_FOOT, UnitUtil.getUnits(ft2));
29+
assertEquals(SQUARE_FOOT, UnitUtil.parse(ft2));
3030

3131
String sqft = "sqft";
32-
assertEquals(SQUARE_FOOT, UnitUtil.getUnits(sqft));
32+
assertEquals(SQUARE_FOOT, UnitUtil.parse(sqft));
3333
}
3434
}

0 commit comments

Comments
 (0)