Wrap uses of jOOQ stream() with try-with-resources. (#1570)

(cherry picked from commit fde517f)

Author: rma-rripken

cwms-data-api/src/main/java/cwms/cda/data/dao/LocationGroupDao.java

@@ -38,6 +38,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
+
 import org.geojson.Feature;
 import org.geojson.FeatureCollection;
 import org.jetbrains.annotations.NotNull;
@@ -442,10 +444,12 @@ public FeatureCollection buildFeatureCollectionForLocationGroup(String locationO
                                 .and(al.UNIT_SYSTEM.eq(units))))
                 .orderBy(groupAssignView.ATTRIBUTE);
 
-        List<Feature> features =
-                select.stream()
-                        .map(this::buildFeatureFromAvLocRecordWithLocGroup)
-                        .collect(toList());
+        List<Feature> features;
+        try (Stream<Record> recordStream = select.stream()) {
+            features = recordStream
+                    .map(this::buildFeatureFromAvLocRecordWithLocGroup)
+                    .collect(toList());
+        }
         FeatureCollection collection = new FeatureCollection();
         collection.setFeatures(features);
 

cwms-data-api/src/main/java/cwms/cda/data/dao/LocationLevelsDaoImpl.java

@@ -77,6 +77,8 @@
 import java.util.Set;
 import com.google.common.flogger.FluentLogger;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
 import mil.army.usace.hec.metadata.Interval;
 import mil.army.usace.hec.metadata.IntervalFactory;
 import mil.army.usace.hec.metadata.constants.NumericalConstants;
@@ -275,7 +277,16 @@ public LocationLevels getLocationLevels(String cursor, int pageSize,
             result.forEach(row -> addToAliasMaps(aliasMap, row));
             result.forEach(row -> parseLevels(row, builderMap, unit, aliasMap, includeAliases));
         } else {
-            query.stream().forEach(r -> parseLevels(r, builderMap, unit, new LinkedHashMap<>(), includeAliases));
+            final int[] count = {0};
+            try (Stream<Record> recordStream = query.stream()) {
+                recordStream.forEach(r -> {
+                            parseLevels(r, builderMap, unit, Collections.emptyMap(), false);
+                            count[0]++;
+                        }
+                );
+            }
+
+            logger.atFine().log("Fetched %d levels", count[0]);
         }
 
         List<LocationLevel> levels = new java.util.ArrayList<>();

cwms-data-api/src/main/java/cwms/cda/data/dao/LocationsDaoImpl.java

@@ -397,9 +397,12 @@ public FeatureCollection buildFeatureCollection(String names, String units, Stri
             selectQuery = selectQuery.and(AV_LOC.LOCATION_ID.in(identifiers));
         }
 
-        List<Feature> features = selectQuery.fetchSize(DEFAULT_SMALL_FETCH_SIZE).stream()
-                .map(LocationsDaoImpl::buildFeatureFromAvLocRecord)
-                .collect(toList());
+        List<Feature> features;
+        try (Stream<Record> recordStream = selectQuery.fetchSize(DEFAULT_SMALL_FETCH_SIZE).stream()) {
+            features = recordStream
+                    .map(LocationsDaoImpl::buildFeatureFromAvLocRecord)
+                    .collect(toList());
+        }
         FeatureCollection collection = new FeatureCollection();
         collection.setFeatures(features);
 

cwms-data-api/src/main/java/cwms/cda/data/dao/PoolDao.java

@@ -10,6 +10,8 @@
 import java.util.List;
 import com.google.common.flogger.FluentLogger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.jetbrains.annotations.NotNull;
 import org.jooq.Condition;
 import org.jooq.DSLContext;
@@ -36,14 +38,16 @@ public List<Pool> catalogPools(String projectIdMask, String poolNameMask,
 		List<String> types = getTypes(includeExplicit, includeImplicit);
 		Condition condition = getCondition(projectIdMask, poolNameMask, bottomLevelMask, topLevelMask, officeIdMask, types);
 
-		return dsl.select(DSL.asterisk()).from(view)
-				.where(condition)
-				.orderBy(view.DEFINITION_TYPE,
-						DSL.upper(view.OFFICE_ID), DSL.upper(view.PROJECT_ID), view.ATTRIBUTE, DSL.upper(view.POOL_NAME))
-				.stream()
-				.map(r -> toPool(r, true))
-				.collect(toList());
-	}
+        try (Stream<Record> recordStream = dsl.select(DSL.asterisk()).from(view)
+                .where(condition)
+                .orderBy(view.DEFINITION_TYPE,
+                        DSL.upper(view.OFFICE_ID), DSL.upper(view.PROJECT_ID), view.ATTRIBUTE, DSL.upper(view.POOL_NAME))
+                .stream()) {
+            return recordStream
+                    .map(r -> toPool(r, true))
+                    .collect(toList());
+        }
+    }
 
 	@NotNull
 	private List<String> getTypes(boolean includeExplicit, boolean includeImplicit) {
@@ -197,15 +201,18 @@ public Pools retrievePools(String cursor, int pageSize,
 		List<String> types = getTypes(includeExplicit, includeImplicit);
 		Condition condition = getCondition(projectIdMask, poolNameMask, bottomLevelMask, topLevelMask, officeIdMask, types);
 
-		List<Pool> pools = dsl.select(DSL.asterisk()).from(view)
-				.where(condition)
-				.orderBy(view.DEFINITION_TYPE,
-						DSL.upper(view.OFFICE_ID), DSL.upper(view.PROJECT_ID), view.ATTRIBUTE, DSL.upper(view.POOL_NAME))
-				.offset(offset)
-				.limit(pageSize)
-				.stream().map(r -> toPool(r, true)).collect(toList());
-
-		Pools.Builder builder = new Pools.Builder(offset, pageSize, total);
+		List<Pool> pools;
+        try (Stream<Record> recordStream = dsl.select(DSL.asterisk()).from(view)
+                .where(condition)
+                .orderBy(view.DEFINITION_TYPE,
+                        DSL.upper(view.OFFICE_ID), DSL.upper(view.PROJECT_ID), view.ATTRIBUTE, DSL.upper(view.POOL_NAME))
+                .offset(offset)
+                .limit(pageSize)
+                .stream()) {
+            pools = recordStream.map(r -> toPool(r, true)).collect(toList());
+        }
+
+        Pools.Builder builder = new Pools.Builder(offset, pageSize, total);
 		builder.addAll(pools);
 		return builder.build();
 	}

cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesIdentifierDescriptorDao.java

@@ -36,6 +36,7 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+
 import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.DSLContext;
@@ -103,23 +104,25 @@ public TimeSeriesIdentifierDescriptors getTimeSeriesIdentifiers(String cursor, i
         Collection<TimeSeriesIdentifierDescriptor> retval;
 
         if (!includeAliases) {
-            retval = dsl
+            try (var record5Stream = dsl
                     .selectDistinct(AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.DB_OFFICE_ID,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.CWMS_TS_ID,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.INTERVAL_UTC_OFFSET,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TS_ACTIVE_FLAG,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TIME_ZONE_ID)
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.CWMS_TS_ID,
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.INTERVAL_UTC_OFFSET,
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TS_ACTIVE_FLAG,
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TIME_ZONE_ID)
                     .from(AV_CWMS_TS_ID2.AV_CWMS_TS_ID2)
                     .where(whereCondition)
                     .orderBy(AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.DB_OFFICE_ID, AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.CWMS_TS_ID,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.INTERVAL_UTC_OFFSET,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TS_ACTIVE_FLAG,
-                        AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TIME_ZONE_ID)
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.INTERVAL_UTC_OFFSET,
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TS_ACTIVE_FLAG,
+                            AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.TIME_ZONE_ID)
                     .limit(pageSize)
                     .offset(offset)
-                    .stream()
-                    .map(this::toDescriptor)
-                    .collect(Collectors.toList());
+                    .stream()) {
+                retval = record5Stream
+                        .map(this::toDescriptor)
+                        .collect(Collectors.toList());
+            }
         } else {
             Table<?> innerTable = AV_CWMS_TS_ID2.AV_CWMS_TS_ID2.as("alias_table");
             Field<String> tsId = innerTable.field("CWMS_TS_ID", String.class);

cwms-data-api/src/main/java/cwms/cda/data/dao/TimeZoneDao.java

@@ -8,6 +8,7 @@
 import usace.cwms.db.jooq.codegen.tables.MV_TIME_ZONE;
 
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class TimeZoneDao extends JooqDao<String> {
 
@@ -21,11 +22,13 @@ public String getTimeZones(String format) {
 
     public TimeZoneIds getTimeZones()
     {
-        return new TimeZoneIds(dsl.select(MV_TIME_ZONE.MV_TIME_ZONE.TIME_ZONE_NAME)
-                                .from(MV_TIME_ZONE.MV_TIME_ZONE)
-                                .stream()
-                                .map(Record1::component1)
-                                .map(TimeZoneId::new)
-                                .collect(Collectors.toList()));
+        try (Stream<Record1<String>> record1Stream = dsl.select(MV_TIME_ZONE.MV_TIME_ZONE.TIME_ZONE_NAME)
+                .from(MV_TIME_ZONE.MV_TIME_ZONE)
+                .stream()) {
+            return new TimeZoneIds(record1Stream
+                    .map(Record1::component1)
+                    .map(TimeZoneId::new)
+                    .collect(Collectors.toList()));
+        }
     }
 }

cwms-data-api/src/main/java/cwms/cda/data/dao/texttimeseries/StandardTextDao.java

@@ -30,10 +30,12 @@
 import cwms.cda.data.dto.texttimeseries.StandardTextValue;
 import org.jooq.Configuration;
 import org.jooq.DSLContext;
+import org.jooq.Record3;
 import usace.cwms.db.jooq.codegen.packages.CWMS_TEXT_PACKAGE;
 import usace.cwms.db.jooq.codegen.tables.AV_STD_TEXT;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
 
@@ -44,19 +46,22 @@ public StandardTextDao(DSLContext dsl) {
 
     public StandardTextCatalog retreiveStandardTextCatalog(String standardTextIdMask, String officeIdMask) {
         AV_STD_TEXT view = AV_STD_TEXT.AV_STD_TEXT;
-        List<StandardTextValue> textValues = dsl.select(view.OFFICE_ID, view.STD_TEXT_ID, view.LONG_TEXT)
+        List<StandardTextValue> textValues;
+        try (Stream<Record3<String, String, String>> record3Stream = dsl.select(view.OFFICE_ID, view.STD_TEXT_ID, view.LONG_TEXT)
                 .from(view)
                 .where(JooqDao.caseInsensitiveLikeRegexNullTrue(view.OFFICE_ID, officeIdMask))
                 .and(JooqDao.caseInsensitiveLikeRegexNullTrue(view.STD_TEXT_ID, standardTextIdMask))
-                .stream()
-                .map(r -> new StandardTextValue.Builder()
-                        .withStandardText(r.get(view.LONG_TEXT))
-                        .withId(new StandardTextId.Builder()
-                                .withId(r.get(view.STD_TEXT_ID))
-                                .withOfficeId(r.get(view.OFFICE_ID))
-                                .build())
-                        .build())
-                .collect(toList());
+                .stream()) {
+            textValues = record3Stream
+                    .map(r -> new StandardTextValue.Builder()
+                            .withStandardText(r.get(view.LONG_TEXT))
+                            .withId(new StandardTextId.Builder()
+                                    .withId(r.get(view.STD_TEXT_ID))
+                                    .withOfficeId(r.get(view.OFFICE_ID))
+                                    .build())
+                            .build())
+                    .collect(toList());
+        }
         return new StandardTextCatalog.Builder()
                 .withValues(textValues)
                 .build();