Merge pull request #6680 from davidwatkins73/waltz-6678-bye-jdk8

Waltz 6678 bye jdk8
finos · Jul 14, 2023 · c2b4042 · c2b4042
2 parents 627e85b + 423c614
commit c2b4042
Show file tree

Hide file tree

Showing 79 changed files with 721 additions and 219 deletions.
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/EntityAliasPopulator.java b/waltz-data/src/main/java/org/finos/waltz/data/EntityAliasPopulator.java
@@ -22,7 +22,13 @@
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.schema.Tables;
-import org.jooq.*;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record2;
+import org.jooq.SelectConditionStep;
+import org.jooq.SelectOrderByStep;
+import org.jooq.Table;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/EntityReferenceNameResolver.java b/waltz-data/src/main/java/org/finos/waltz/data/EntityReferenceNameResolver.java
@@ -21,7 +21,11 @@
 import org.finos.waltz.common.ListUtilities;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record2;
+import org.jooq.SelectSelectStep;
+import org.jooq.Table;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/InlineSelectFieldFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/InlineSelectFieldFactory.java
@@ -20,7 +20,12 @@
 
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityLifecycleStatus;
-import org.jooq.*;
+import org.jooq.CaseConditionStep;
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Select;
+import org.jooq.Table;
 import org.jooq.impl.DSL;
 import org.jooq.lambda.tuple.Tuple2;
 import org.jooq.lambda.tuple.Tuple3;

diff --git a/...va/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramInstanceDao.java b/...va/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramInstanceDao.java
@@ -3,30 +3,26 @@
 
 import org.finos.waltz.common.DateTimeUtilities;
 import org.finos.waltz.data.InlineSelectFieldFactory;
-import org.finos.waltz.data.JooqUtilities;
-import org.finos.waltz.data.application.ApplicationIdSelectorFactory;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
-import org.finos.waltz.model.aggregate_overlay_diagram.*;
+import org.finos.waltz.model.aggregate_overlay_diagram.AggregateOverlayDiagramInstance;
+import org.finos.waltz.model.aggregate_overlay_diagram.ImmutableAggregateOverlayDiagramInstance;
+import org.finos.waltz.model.aggregate_overlay_diagram.OverlayDiagramInstanceCreateCommand;
 import org.finos.waltz.schema.tables.records.AggregateOverlayDiagramInstanceRecord;
-import org.finos.waltz.schema.tables.records.AggregateOverlayDiagramRecord;
-import org.jooq.*;
-import org.jooq.impl.DSL;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record;
+import org.jooq.RecordMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import java.util.Map;
 import java.util.Set;
 
-import static java.util.stream.Collectors.*;
 import static org.finos.waltz.common.Checks.checkNotNull;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
 import static org.finos.waltz.common.ListUtilities.newArrayList;
-import static org.finos.waltz.data.JooqUtilities.readRef;
 import static org.finos.waltz.model.EntityReference.mkRef;
-import static org.finos.waltz.model.IdSelectionOptions.mkOpts;
-import static org.finos.waltz.schema.Tables.*;
-import static org.jooq.lambda.tuple.Tuple.tuple;
+import static org.finos.waltz.schema.Tables.AGGREGATE_OVERLAY_DIAGRAM_INSTANCE;
 
 @Repository
 public class AggregateOverlayDiagramInstanceDao {

diff --git a/...main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregatedEntitiesWidgetDao.java b/...main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregatedEntitiesWidgetDao.java
@@ -5,7 +5,12 @@
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.AggregatedEntitiesWidgetDatum;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.ImmutableAggregatedEntitiesWidgetDatum;
 import org.finos.waltz.schema.Tables;
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.Select;
+import org.jooq.Table;
+import org.jooq.TableField;
 import org.jooq.lambda.tuple.Tuple2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

diff --git a/...-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AppCountWidgetDao.java b/...-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AppCountWidgetDao.java
@@ -4,7 +4,12 @@
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.CountWidgetDatum;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.ImmutableCountWidgetDatum;
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Record2;
+import org.jooq.Select;
+import org.jooq.SelectConditionStep;
 import org.jooq.impl.DSL;
 import org.jooq.lambda.tuple.Tuple2;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...c/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AssessmentRatingWidgetDao.java b/...c/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AssessmentRatingWidgetDao.java
@@ -9,7 +9,9 @@
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.ImmutableAssessmentRatingCount;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.ImmutableAssessmentRatingsWidgetDatum;
 import org.finos.waltz.schema.tables.AssessmentRating;
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Record1;
+import org.jooq.Select;
 import org.jooq.lambda.tuple.Tuple2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

diff --git a/.../src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/TargetAppCostWidgetDao.java b/.../src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/TargetAppCostWidgetDao.java
@@ -4,7 +4,13 @@
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.ImmutableTargetCostWidgetDatum;
 import org.finos.waltz.model.aggregate_overlay_diagram.overlay.TargetCostWidgetDatum;
-import org.jooq.*;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Record3;
+import org.jooq.Select;
+import org.jooq.SelectConditionStep;
 import org.jooq.impl.DSL;
 import org.jooq.lambda.tuple.Tuple2;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/allocation/AllocationDao.java b/waltz-data/src/main/java/org/finos/waltz/data/allocation/AllocationDao.java
@@ -18,7 +18,6 @@
 
 package org.finos.waltz.data.allocation;
 
-import org.finos.waltz.schema.tables.records.AllocationRecord;
 import org.finos.waltz.common.CollectionUtilities;
 import org.finos.waltz.common.DateTimeUtilities;
 import org.finos.waltz.common.ListUtilities;
@@ -27,7 +26,12 @@
 import org.finos.waltz.model.allocation.Allocation;
 import org.finos.waltz.model.allocation.ImmutableAllocation;
 import org.finos.waltz.model.allocation.MeasurablePercentageChange;
-import org.jooq.*;
+import org.finos.waltz.schema.tables.records.AllocationRecord;
+import org.jooq.DSLContext;
+import org.jooq.Record;
+import org.jooq.Record3;
+import org.jooq.RecordMapper;
+import org.jooq.SelectConditionStep;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -36,9 +40,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.finos.waltz.schema.Tables.ALLOCATION;
 import static org.finos.waltz.common.MapUtilities.groupBy;
 import static org.finos.waltz.data.JooqUtilities.readRef;
+import static org.finos.waltz.schema.Tables.ALLOCATION;
 
 @Repository
 public class AllocationDao {

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/application/ApplicationIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/application/ApplicationIdSelectorFactory.java
@@ -28,7 +28,13 @@
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.IdSelectionOptions;
 import org.finos.waltz.model.ImmutableIdSelectionOptions;
-import org.jooq.*;
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Select;
+import org.jooq.SelectConditionStep;
+import org.jooq.SelectOrderByStep;
+import org.jooq.SelectWhereStep;
 import org.jooq.impl.DSL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/attestation/AttestationRunDao.java b/waltz-data/src/main/java/org/finos/waltz/data/attestation/AttestationRunDao.java
@@ -18,15 +18,25 @@
 
 package org.finos.waltz.data.attestation;
 
-import org.finos.waltz.data.involvement_group.InvolvementGroupDao;
-import org.finos.waltz.schema.tables.records.AttestationRunRecord;
 import org.finos.waltz.data.InlineSelectFieldFactory;
+import org.finos.waltz.data.involvement_group.InvolvementGroupDao;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.HierarchyQueryScope;
 import org.finos.waltz.model.IdSelectionOptions;
-import org.finos.waltz.model.attestation.*;
-import org.jooq.*;
+import org.finos.waltz.model.attestation.AttestationRun;
+import org.finos.waltz.model.attestation.AttestationRunCreateCommand;
+import org.finos.waltz.model.attestation.AttestationRunResponseSummary;
+import org.finos.waltz.model.attestation.AttestationStatus;
+import org.finos.waltz.model.attestation.ImmutableAttestationRun;
+import org.finos.waltz.model.attestation.ImmutableAttestationRunResponseSummary;
+import org.finos.waltz.schema.tables.records.AttestationRunRecord;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.Select;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -38,14 +48,14 @@
 import java.util.Set;
 
 import static java.util.Collections.emptyList;
-import static org.finos.waltz.schema.Tables.SURVEY_RUN;
+import static org.finos.waltz.common.Checks.checkNotNull;
+import static org.finos.waltz.common.DateTimeUtilities.nowUtcTimestamp;
+import static org.finos.waltz.common.DateTimeUtilities.toLocalDate;
+import static org.finos.waltz.common.DateTimeUtilities.toSqlDate;
+import static org.finos.waltz.common.ListUtilities.newArrayList;
 import static org.finos.waltz.schema.tables.AttestationInstance.ATTESTATION_INSTANCE;
 import static org.finos.waltz.schema.tables.AttestationInstanceRecipient.ATTESTATION_INSTANCE_RECIPIENT;
 import static org.finos.waltz.schema.tables.AttestationRun.ATTESTATION_RUN;
-import static org.finos.waltz.common.Checks.checkNotNull;
-import static org.finos.waltz.common.DateTimeUtilities.*;
-import static org.finos.waltz.common.ListUtilities.newArrayList;
-import static org.finos.waltz.common.StringUtilities.join;
 
 @Repository
 public class AttestationRunDao {

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/bookmark/BookmarkDao.java b/waltz-data/src/main/java/org/finos/waltz/data/bookmark/BookmarkDao.java
@@ -18,15 +18,19 @@
 
 package org.finos.waltz.data.bookmark;
 
-import org.finos.waltz.schema.tables.records.BookmarkRecord;
 import org.finos.waltz.data.GenericSelector;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.ImmutableEntityReference;
 import org.finos.waltz.model.bookmark.Bookmark;
 import org.finos.waltz.model.bookmark.BookmarkKindValue;
 import org.finos.waltz.model.bookmark.ImmutableBookmark;
-import org.jooq.*;
+import org.finos.waltz.schema.tables.records.BookmarkRecord;
+import org.jooq.DSLContext;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.Select;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -36,8 +40,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import static org.finos.waltz.common.Checks.checkNotEmpty;
+import static org.finos.waltz.common.Checks.checkNotNull;
+import static org.finos.waltz.common.Checks.checkOptionalIsPresent;
+import static org.finos.waltz.common.Checks.checkTrue;
 import static org.finos.waltz.schema.tables.Bookmark.BOOKMARK;
-import static org.finos.waltz.common.Checks.*;
 
 
 @Repository

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/change_set/ChangeSetDao.java b/waltz-data/src/main/java/org/finos/waltz/data/change_set/ChangeSetDao.java
@@ -18,14 +18,19 @@
 
 package org.finos.waltz.data.change_set;
 
-import org.finos.waltz.schema.tables.records.ChangeSetRecord;
 import org.finos.waltz.data.InlineSelectFieldFactory;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityLifecycleStatus;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.change_set.ChangeSet;
 import org.finos.waltz.model.change_set.ImmutableChangeSet;
-import org.jooq.*;
+import org.finos.waltz.schema.tables.records.ChangeSetRecord;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.Select;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -35,11 +40,11 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import static org.finos.waltz.schema.Tables.CHANGE_SET;
-import static org.finos.waltz.schema.Tables.INVOLVEMENT;
 import static org.finos.waltz.common.Checks.checkNotNull;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
 import static org.finos.waltz.common.ListUtilities.newArrayList;
+import static org.finos.waltz.schema.Tables.CHANGE_SET;
+import static org.finos.waltz.schema.Tables.INVOLVEMENT;
 
 
 @Repository

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitDao.java b/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitDao.java
@@ -18,15 +18,23 @@
 
 package org.finos.waltz.data.change_unit;
 
-import org.finos.waltz.schema.tables.records.ChangeSetRecord;
-import org.finos.waltz.schema.tables.records.ChangeUnitRecord;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityLifecycleStatus;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.UserTimestamp;
 import org.finos.waltz.model.change_set.ChangeSet;
-import org.finos.waltz.model.change_unit.*;
-import org.jooq.*;
+import org.finos.waltz.model.change_unit.ChangeAction;
+import org.finos.waltz.model.change_unit.ChangeUnit;
+import org.finos.waltz.model.change_unit.ExecutionStatus;
+import org.finos.waltz.model.change_unit.ImmutableChangeUnit;
+import org.finos.waltz.model.change_unit.UpdateExecutionStatusCommand;
+import org.finos.waltz.schema.tables.records.ChangeSetRecord;
+import org.finos.waltz.schema.tables.records.ChangeUnitRecord;
+import org.jooq.DSLContext;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.RecordMapper;
+import org.jooq.Select;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -35,10 +43,12 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import static org.finos.waltz.schema.tables.ChangeUnit.CHANGE_UNIT;
-import static org.finos.waltz.common.Checks.*;
+import static org.finos.waltz.common.Checks.checkNotNull;
+import static org.finos.waltz.common.Checks.checkOptionalIsPresent;
+import static org.finos.waltz.common.Checks.checkTrue;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
 import static org.finos.waltz.model.EntityReference.mkRef;
+import static org.finos.waltz.schema.tables.ChangeUnit.CHANGE_UNIT;
 
 
 @Repository

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/changelog/ChangeLogSummariesDao.java b/waltz-data/src/main/java/org/finos/waltz/data/changelog/ChangeLogSummariesDao.java
@@ -26,7 +26,13 @@
 import org.finos.waltz.model.tally.DateTally;
 import org.finos.waltz.model.tally.ImmutableChangeLogTally;
 import org.finos.waltz.model.tally.ImmutableDateTally;
-import org.jooq.*;
+import org.jooq.AggregateFunction;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record2;
+import org.jooq.Record5;
+import org.jooq.RecordMapper;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/complexity/ConnectionComplexityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/complexity/ConnectionComplexityDao.java
@@ -21,7 +21,13 @@
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.tally.ImmutableTally;
 import org.finos.waltz.model.tally.Tally;
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Condition;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Record2;
+import org.jooq.Select;
+import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

diff --git a/waltz-data/src/main/java/org/finos/waltz/data/complexity/MeasurableComplexityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/complexity/MeasurableComplexityDao.java
@@ -21,7 +21,14 @@
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.tally.ImmutableTally;
 import org.finos.waltz.model.tally.Tally;
-import org.jooq.*;
+import org.jooq.Condition;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.Record1;
+import org.jooq.Record2;
+import org.jooq.RecordMapper;
+import org.jooq.Select;
+import org.jooq.SelectHavingStep;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;