Apply new spotless plugin

Author: lesserwhirls

cdm-test-utils/src/main/java/ucar/unidata/util/test/UtilsTestStructureArray.java

@@ -75,8 +75,8 @@ private void testArrayStructureByRecno(ArrayStructure as) {
       List<StructureMembers.Member> members = sdata.getMembers();
       for (StructureMembers.Member m : members) {
         Array sdataArray = sdata.getArray(m);
-        assert (sdataArray.getElementType() == m.getDataType().getPrimitiveClassType()) : sdataArray.getElementType()
-            + " != " + m.getDataType().getPrimitiveClassType();
+        assert (sdataArray.getElementType() == m.getDataType().getPrimitiveClassType())
+            : sdataArray.getElementType() + " != " + m.getDataType().getPrimitiveClassType();
 
         Array sdataArray2 = sdata.getArray(m.getName());
         UtilsMa2Test.testEquals(sdataArray, sdataArray2);

cdm-test/src/test/java/ucar/nc2/dataset/TestTransforms.java

@@ -309,8 +309,8 @@ private VerticalTransform test(NetcdfDataset ncd, String levName, String varName
     // should be compatible with vunit
     if (vunit != null) {
       String vertCoordUnit = vt.getUnitString();
-      assert vunit.isCompatible(vertCoordUnit) : vertCoordUnit + " not udunits compatible with "
-          + vunit.getUnitString();
+      assert vunit.isCompatible(vertCoordUnit)
+          : vertCoordUnit + " not udunits compatible with " + vunit.getUnitString();
     }
 
     return vt;

cdm-test/src/test/java/ucar/nc2/ncml/TestNcMLStrides.java

@@ -100,8 +100,8 @@ public void testStride(String stride) throws IOException, InvalidRangeException
     Index ci = correct.getIndex();
     Index di = data.getIndex();
     for (int i = 0; i < data.getSize(); i++)
-      assert (data.getInt(di.set(i)) == correct.getInt(ci.set(i))) : stride + " index " + i + " = "
-          + data.getInt(di.set(i)) + " != " + correct.getInt(ci.set(i));
+      assert (data.getInt(di.set(i)) == correct.getInt(ci.set(i)))
+          : stride + " index " + i + " = " + data.getInt(di.set(i)) + " != " + correct.getInt(ci.set(i));
   }
 
 }

cdm/core/src/main/java/ucar/ma2/ArrayStructureMA.java

@@ -228,9 +228,9 @@ public static ArrayStructureMA factoryMA(ArrayStructure from) throws IOException
       if (numRecords == -1) {
         numRecords = firstDimLen;
       } else {
-        assert numRecords == firstDimLen : String.format(
-            "Expected all structure members to have the same first" + "dimension length, but %d != %d.", numRecords,
-            firstDimLen);
+        assert numRecords == firstDimLen
+            : String.format("Expected all structure members to have the same first" + "dimension length, but %d != %d.",
+                numRecords, firstDimLen);
       }
 
       memberArrayMap.put(m.getName(), array);

cdm/core/src/main/java/ucar/nc2/ft/point/standard/plug/CFpointObs.java

@@ -420,8 +420,8 @@ protected TableConfig getTimeSeriesProfileConfig(NetcdfDataset ds, EncodingInfo
             // zDim = z.getDimension(0);
           }
         } else { // 1d time
-          assert z.getRank() != 1
-              || !time.getDimension(0).equals(z.getDimension(0)) : "time and z dimensions must be different";
+          assert z.getRank() != 1 || !time.getDimension(0).equals(z.getDimension(0))
+              : "time and z dimensions must be different";
         }
 
         TableConfig profileTable = makeMultidimInner(ds, stationTable, info.childDim, info, errlog);

cdm/core/src/main/java/ucar/nc2/ft2/coverage/HorizCoordSys.java

@@ -756,8 +756,8 @@ private static int calcStride(int numTotal, int maxToInclude) {
     int stride = Math.max(1, (int) Math.ceil(numTotal / (double) maxToInclude));
     int numIncluded = (int) Math.ceil(numTotal / (double) stride);
 
-    assert numIncluded <= maxToInclude : String.format("We're set to include %d points, but we wanted a max of %d.",
-        numIncluded, maxToInclude);
+    assert numIncluded <= maxToInclude
+        : String.format("We're set to include %d points, but we wanted a max of %d.", numIncluded, maxToInclude);
     return stride;
   }
 
@@ -766,9 +766,9 @@ private static void assertNotExceedingMaxBoundaryPoints(int numBoundaryPoints, i
     // Widen to long to avoid possible overflow, because last two arguments will often be Integer.MAX_VALUE.
     long maxBoundaryPoints = 2 * (long) maxPointsInYEdge + 2 * (long) maxPointsInXEdge;
 
-    assert numBoundaryPoints <= maxBoundaryPoints : String.format(
-        "We should be returning a maximum of %d boundary points, but we're returning %d instead.", maxBoundaryPoints,
-        numBoundaryPoints);
+    assert numBoundaryPoints <= maxBoundaryPoints
+        : String.format("We should be returning a maximum of %d boundary points, but we're returning %d instead.",
+            maxBoundaryPoints, numBoundaryPoints);
   }
 
   /**

cdm/core/src/test/java/thredds/client/catalog/TestResolve.java

@@ -28,8 +28,8 @@ public void testResolve() throws IOException {
     logger.debug("ACD service= {}", s);
 
     assert getAccessURL(cat, "nest11").equals("http://www.acd.ucar.edu/dods/testServer/flux/CO2.nc");
-    assert getAccessURL(cat, "nest12").equals(base + "netcdf/data/flux/NO2.nc") : getAccessURL(cat, "nest12") + " != "
-        + ClientCatalogUtil.makeFilepath() + "netcdf/data/flux/NO2.nc";
+    assert getAccessURL(cat, "nest12").equals(base + "netcdf/data/flux/NO2.nc")
+        : getAccessURL(cat, "nest12") + " != " + ClientCatalogUtil.makeFilepath() + "netcdf/data/flux/NO2.nc";
 
     assert getMetadataURL(cat, "nest1", "NETCDF").equals("any.xml");
     assert getMetadataURL(cat, "nest1", "ADN").equals("http://you/corrupt.xml");

netcdf4/src/main/java/ucar/nc2/jni/netcdf/Nc4Iosp.java

@@ -331,9 +331,9 @@ private void makeDimensions(Group4 g4) throws IOException {
     if (ret != 0)
       throw new IOException(ret + ": " + nc4.nc_strerror(ret));
 
-    assert numDimsInGoup_p.getValue() == numDimidsInGroup_p.getValue() : String.format(
-        "Number of dimensions in group (%s) differed from number of dimension IDs in group (%s).",
-        numDimsInGoup_p.getValue(), numDimidsInGroup_p.getValue());
+    assert numDimsInGoup_p.getValue() == numDimidsInGroup_p.getValue()
+        : String.format("Number of dimensions in group (%s) differed from number of dimension IDs in group (%s).",
+            numDimsInGoup_p.getValue(), numDimidsInGroup_p.getValue());
 
     // We need this in order to allocate the correct length for unlimitedDimIdsInGroup.
     IntByReference numUnlimitedDimsInGroup_p = new IntByReference();

waterml/src/main/java/ucar/nc2/ogc/waterml/NcMeasureType.java

@@ -22,8 +22,8 @@ public static MeasureType initValue(MeasureType value, PointFeature pointFeat, V
         .format("%s appeared in the list of data variables but not in the StructureData.", dataVar.getShortName());
 
     Array dataArray = pointFeat.getDataAll().getArray(firstDataMember);
-    assert dataArray.getSize() == 1 : String.format("Expected array to be scalar, but its shape was %s.",
-        Arrays.toString(dataArray.getShape()));
+    assert dataArray.getSize() == 1
+        : String.format("Expected array to be scalar, but its shape was %s.", Arrays.toString(dataArray.getShape()));
 
     double dataVal = dataArray.getDouble(0);
     value.setDoubleValue(dataVal);