From e8be6628c6477f73ef50226af758132c4613ec83 Mon Sep 17 00:00:00 2001 From: David Watkins Date: Fri, 14 Jul 2023 08:13:15 +0100 Subject: [PATCH 1/2] Removing wild card imports of org.jooq.Record #6678 --- .../AggregateOverlayDiagramInstanceDao.java | 20 +++++-------- .../AggregatedEntitiesWidgetDao.java | 7 ++++- .../waltz/data/allocation/AllocationDao.java | 10 +++++-- .../data/attestation/AttestationRunDao.java | 28 ++++++++++++------ .../waltz/data/bookmark/BookmarkDao.java | 13 +++++++-- .../waltz/data/change_set/ChangeSetDao.java | 13 ++++++--- .../waltz/data/change_unit/ChangeUnitDao.java | 22 ++++++++++---- .../org/finos/waltz/data/cost/CostDao.java | 16 ++++++++-- .../LogicalFlowDecoratorDao.java | 27 +++++++++++------ .../PhysicalSpecDecoratorDao.java | 19 ++++++++---- .../data/end_user_app/EndUserAppDao.java | 10 +++++-- .../EntityRelationshipDao.java | 16 ++++++++-- .../entity_statistic/EntityStatisticDao.java | 7 ++++- .../EntityStatisticDefinitionDao.java | 15 ++++++++-- .../EntityStatisticValueDao.java | 11 +++++-- .../flow_diagram/FlowDiagramEntityDao.java | 16 +++++++--- .../data/involvement/InvolvementDao.java | 17 +++++++++-- .../involvement_kind/InvolvementKindDao.java | 20 +++++++++++-- .../data/legal_entity/LegalEntityDao.java | 6 +++- .../finos/waltz/data/licence/LicenceDao.java | 13 +++++++-- .../LogicalDataElementDao.java | 6 +++- .../MeasurableCategoryDao.java | 12 ++++++-- ...easurableRatingPlannedDecommissionDao.java | 26 ++++++++--------- .../MeasurableRatingReplacementDao.java | 21 +++++++++----- .../data/notification/NotificationDao.java | 9 ++++-- .../PhysicalFlowParticipantDao.java | 10 +++++-- .../PhysicalSpecDefinitionDao.java | 10 +++++-- .../PhysicalSpecDefinitionFieldDao.java | 10 +++++-- .../data/rating_scheme/RatingSchemeDAO.java | 21 ++++++++++++-- .../waltz/data/rel/RelationshipKindDao.java | 9 ++++-- .../data/scenario/ScenarioAxisItemDao.java | 11 +++++-- .../waltz/data/scenario/ScenarioDao.java | 12 ++++++-- .../data/scenario/ScenarioRatingItemDao.java | 13 ++++++--- .../data/server_usage/ServerUsageDao.java | 11 +++++-- .../software_catalog/SoftwarePackageDao.java | 20 +++++++++---- .../SoftwarePackageViewDao.java | 10 +++++-- .../waltz/data/survey/SurveyInstanceDao.java | 29 +++++++++++++++++-- .../data/survey/SurveyInstanceOwnerDao.java | 17 +++++++++-- .../survey/SurveyInstanceRecipientDao.java | 21 ++++++++++---- .../waltz/data/survey/SurveyQuestionDao.java | 14 ++++++--- .../SurveyQuestionDropdownEntryDao.java | 11 +++++-- .../survey/SurveyQuestionResponseDao.java | 23 +++++++++++++-- .../finos/waltz/data/survey/SurveyRunDao.java | 17 +++++++++-- .../java/org/finos/waltz/data/tag/TagDao.java | 22 ++++++++++---- 44 files changed, 500 insertions(+), 171 deletions(-) diff --git a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramInstanceDao.java b/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramInstanceDao.java index cc7cc9b89..4ab582632 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregateOverlayDiagramInstanceDao.java +++ b/waltz-data/src/main/java/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/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregatedEntitiesWidgetDao.java b/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregatedEntitiesWidgetDao.java index 19cbbb2f5..71c3e00a1 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AggregatedEntitiesWidgetDao.java +++ b/waltz-data/src/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/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 index b02a755d6..09c687832 100644 --- 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/attestation/AttestationRunDao.java b/waltz-data/src/main/java/org/finos/waltz/data/attestation/AttestationRunDao.java index 60262c5a0..b5cb74605 100644 --- 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 index 17d7b03d9..5d936b03b 100644 --- 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,7 +18,6 @@ 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; @@ -26,7 +25,12 @@ 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 index 4b0eef21a..8683bbf63 100644 --- 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 index dab7e0781..09b0670b6 100644 --- 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/cost/CostDao.java b/waltz-data/src/main/java/org/finos/waltz/data/cost/CostDao.java index 13bd1c126..4cc9cbbbb 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/cost/CostDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/cost/CostDao.java @@ -18,14 +18,24 @@ package org.finos.waltz.data.cost; -import org.finos.waltz.schema.tables.records.CostRecord; import org.finos.waltz.data.GenericSelector; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.cost.EntityCost; import org.finos.waltz.model.cost.ImmutableEntityCost; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.CostRecord; +import org.jooq.CommonTableExpression; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record2; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; +import org.jooq.SelectOnConditionStep; +import org.jooq.SelectSeekStep1; import org.jooq.impl.DSL; import org.jooq.lambda.tuple.Tuple2; import org.springframework.beans.factory.annotation.Autowired; @@ -36,11 +46,11 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.finos.waltz.schema.Tables.COST; import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime; import static org.finos.waltz.common.ListUtilities.newArrayList; import static org.finos.waltz.data.JooqUtilities.selectorToCTE; import static org.finos.waltz.model.EntityReference.mkRef; +import static org.finos.waltz.schema.Tables.COST; import static org.jooq.lambda.tuple.Tuple.tuple; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/LogicalFlowDecoratorDao.java b/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/LogicalFlowDecoratorDao.java index 8f6b54208..c232e47ae 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/LogicalFlowDecoratorDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/LogicalFlowDecoratorDao.java @@ -18,8 +18,6 @@ package org.finos.waltz.data.datatype_decorator; -import org.finos.waltz.schema.tables.LogicalFlowDecorator; -import org.finos.waltz.schema.tables.records.LogicalFlowDecoratorRecord; import org.finos.waltz.common.SetUtilities; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; @@ -31,7 +29,18 @@ import org.finos.waltz.model.datatype.ImmutableDataTypeUsageCharacteristics; import org.finos.waltz.model.flow_classification_rule.FlowClassificationRuleVantagePoint; import org.finos.waltz.model.rating.AuthoritativenessRatingValue; -import org.jooq.*; +import org.finos.waltz.schema.tables.LogicalFlowDecorator; +import org.finos.waltz.schema.tables.records.LogicalFlowDecoratorRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Query; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RecordMapper; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.Update; import org.jooq.impl.DSL; import org.jooq.lambda.function.Function2; import org.springframework.beans.factory.annotation.Autowired; @@ -44,12 +53,6 @@ import java.util.Set; import java.util.function.Function; -import static org.finos.waltz.schema.Tables.PHYSICAL_FLOW; -import static org.finos.waltz.schema.tables.Application.APPLICATION; -import static org.finos.waltz.schema.tables.EntityHierarchy.ENTITY_HIERARCHY; -import static org.finos.waltz.schema.tables.LogicalFlow.LOGICAL_FLOW; -import static org.finos.waltz.schema.tables.LogicalFlowDecorator.LOGICAL_FLOW_DECORATOR; -import static org.finos.waltz.schema.tables.PhysicalSpecDataType.PHYSICAL_SPEC_DATA_TYPE; import static java.lang.String.format; import static java.util.stream.Collectors.toList; import static org.finos.waltz.common.Checks.checkNotNull; @@ -58,6 +61,12 @@ import static org.finos.waltz.model.EntityKind.DATA_TYPE; import static org.finos.waltz.model.EntityKind.LOGICAL_DATA_FLOW; import static org.finos.waltz.model.EntityReference.mkRef; +import static org.finos.waltz.schema.Tables.PHYSICAL_FLOW; +import static org.finos.waltz.schema.tables.Application.APPLICATION; +import static org.finos.waltz.schema.tables.EntityHierarchy.ENTITY_HIERARCHY; +import static org.finos.waltz.schema.tables.LogicalFlow.LOGICAL_FLOW; +import static org.finos.waltz.schema.tables.LogicalFlowDecorator.LOGICAL_FLOW_DECORATOR; +import static org.finos.waltz.schema.tables.PhysicalSpecDataType.PHYSICAL_SPEC_DATA_TYPE; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/PhysicalSpecDecoratorDao.java b/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/PhysicalSpecDecoratorDao.java index 71931c10f..61fc4d621 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/PhysicalSpecDecoratorDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/datatype_decorator/PhysicalSpecDecoratorDao.java @@ -18,8 +18,6 @@ package org.finos.waltz.data.datatype_decorator; -import org.finos.waltz.schema.Tables; -import org.finos.waltz.schema.tables.records.PhysicalSpecDataTypeRecord; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.model.EntityReference; @@ -28,7 +26,16 @@ import org.finos.waltz.model.datatype.ImmutableDataTypeDecorator; import org.finos.waltz.model.datatype.ImmutableDataTypeUsageCharacteristics; import org.finos.waltz.model.rating.AuthoritativenessRatingValue; -import org.jooq.*; +import org.finos.waltz.schema.Tables; +import org.finos.waltz.schema.tables.records.PhysicalSpecDataTypeRecord; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record7; +import org.jooq.RecordMapper; +import org.jooq.Select; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -39,9 +46,6 @@ import java.util.Optional; import java.util.function.Function; -import static org.finos.waltz.schema.tables.LogicalFlowDecorator.LOGICAL_FLOW_DECORATOR; -import static org.finos.waltz.schema.tables.PhysicalFlow.PHYSICAL_FLOW; -import static org.finos.waltz.schema.tables.PhysicalSpecDataType.PHYSICAL_SPEC_DATA_TYPE; import static java.lang.String.format; import static java.util.stream.Collectors.toList; import static org.finos.waltz.common.Checks.checkNotNull; @@ -50,6 +54,9 @@ import static org.finos.waltz.model.EntityKind.DATA_TYPE; import static org.finos.waltz.model.EntityKind.PHYSICAL_SPECIFICATION; import static org.finos.waltz.model.EntityReference.mkRef; +import static org.finos.waltz.schema.tables.LogicalFlowDecorator.LOGICAL_FLOW_DECORATOR; +import static org.finos.waltz.schema.tables.PhysicalFlow.PHYSICAL_FLOW; +import static org.finos.waltz.schema.tables.PhysicalSpecDataType.PHYSICAL_SPEC_DATA_TYPE; @Repository public class PhysicalSpecDecoratorDao extends DataTypeDecoratorDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppDao.java b/waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppDao.java index db80c94b4..86ef373bd 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/end_user_app/EndUserAppDao.java @@ -18,22 +18,26 @@ package org.finos.waltz.data.end_user_app; -import org.finos.waltz.schema.tables.records.EndUserApplicationRecord; import org.finos.waltz.data.JooqUtilities; import org.finos.waltz.model.Criticality; import org.finos.waltz.model.application.LifecyclePhase; import org.finos.waltz.model.enduserapp.EndUserApplication; import org.finos.waltz.model.enduserapp.ImmutableEndUserApplication; import org.finos.waltz.model.tally.Tally; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.EndUserApplicationRecord; +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; import java.util.List; -import static org.finos.waltz.schema.tables.EndUserApplication.END_USER_APPLICATION; import static java.util.Optional.ofNullable; import static org.finos.waltz.common.StringUtilities.mkSafe; +import static org.finos.waltz.schema.tables.EndUserApplication.END_USER_APPLICATION; @Repository public class EndUserAppDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/entity_relationship/EntityRelationshipDao.java b/waltz-data/src/main/java/org/finos/waltz/data/entity_relationship/EntityRelationshipDao.java index 079873beb..91dbbf528 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/entity_relationship/EntityRelationshipDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/entity_relationship/EntityRelationshipDao.java @@ -24,10 +24,22 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.ImmutableEntityReference; -import org.finos.waltz.model.entity_relationship.*; +import org.finos.waltz.model.entity_relationship.EntityRelationship; +import org.finos.waltz.model.entity_relationship.EntityRelationshipKey; +import org.finos.waltz.model.entity_relationship.ImmutableEntityRelationship; +import org.finos.waltz.model.entity_relationship.RelationshipKind; +import org.finos.waltz.model.entity_relationship.UpdateEntityRelationshipParams; import org.finos.waltz.schema.Tables; import org.finos.waltz.schema.tables.records.EntityRelationshipRecord; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Query; +import org.jooq.Record; +import org.jooq.Record3; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; +import org.jooq.SelectOrderByStep; 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/entity_statistic/EntityStatisticDao.java b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDao.java index 0b66e4f10..1b4f13f8a 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDao.java @@ -25,7 +25,12 @@ import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.entity_statistic.EntityStatistic; import org.finos.waltz.model.entity_statistic.ImmutableEntityStatistic; -import org.jooq.*; +import org.jooq.Condition; +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; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDefinitionDao.java b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDefinitionDao.java index a690bb99f..f5f75c3bd 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDefinitionDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticDefinitionDao.java @@ -18,9 +18,18 @@ package org.finos.waltz.data.entity_statistic; +import org.finos.waltz.model.entity_statistic.EntityStatisticDefinition; +import org.finos.waltz.model.entity_statistic.ImmutableEntityStatisticDefinition; +import org.finos.waltz.model.entity_statistic.RollupKind; +import org.finos.waltz.model.entity_statistic.StatisticCategory; +import org.finos.waltz.model.entity_statistic.StatisticType; import org.finos.waltz.schema.tables.records.EntityStatisticDefinitionRecord; -import org.finos.waltz.model.entity_statistic.*; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -29,8 +38,8 @@ import java.util.Optional; import java.util.function.Function; -import static org.finos.waltz.schema.tables.EntityStatisticDefinition.ENTITY_STATISTIC_DEFINITION; import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.schema.tables.EntityStatisticDefinition.ENTITY_STATISTIC_DEFINITION; @Repository public class EntityStatisticDefinitionDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticValueDao.java b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticValueDao.java index 96aeb6a5c..3255e9fa4 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticValueDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticValueDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.entity_statistic; -import org.finos.waltz.schema.tables.records.EntityStatisticValueRecord; import org.finos.waltz.data.application.ApplicationDao; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.ImmutableEntityReference; @@ -26,7 +25,13 @@ import org.finos.waltz.model.entity_statistic.EntityStatisticValue; import org.finos.waltz.model.entity_statistic.ImmutableEntityStatisticValue; import org.finos.waltz.model.entity_statistic.StatisticValueState; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.EntityStatisticValueRecord; +import org.jooq.Condition; +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; @@ -34,9 +39,9 @@ import java.util.List; import java.util.stream.Collectors; +import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.schema.tables.Application.APPLICATION; import static org.finos.waltz.schema.tables.EntityStatisticValue.ENTITY_STATISTIC_VALUE; -import static org.finos.waltz.common.Checks.checkNotNull; @Repository public class EntityStatisticValueDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java index 43fbdb12c..9e1d3c61b 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.flow_diagram; -import org.finos.waltz.schema.tables.records.FlowDiagramEntityRecord; import org.finos.waltz.data.GenericSelector; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; @@ -27,7 +26,14 @@ import org.finos.waltz.model.ImmutableEntityReference; import org.finos.waltz.model.flow_diagram.FlowDiagramEntity; import org.finos.waltz.model.flow_diagram.ImmutableFlowDiagramEntity; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.FlowDiagramEntityRecord; +import org.jooq.Condition; +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; @@ -36,13 +42,15 @@ import java.util.Optional; import java.util.function.Function; -import static org.finos.waltz.schema.tables.FlowDiagramEntity.FLOW_DIAGRAM_ENTITY; import static java.lang.String.format; import static java.util.stream.Collectors.toList; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.EnumUtilities.readEnum; -import static org.finos.waltz.common.ListUtilities.*; +import static org.finos.waltz.common.ListUtilities.asList; +import static org.finos.waltz.common.ListUtilities.map; +import static org.finos.waltz.common.ListUtilities.newArrayList; import static org.finos.waltz.model.EntityReference.mkRef; +import static org.finos.waltz.schema.tables.FlowDiagramEntity.FLOW_DIAGRAM_ENTITY; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/involvement/InvolvementDao.java b/waltz-data/src/main/java/org/finos/waltz/data/involvement/InvolvementDao.java index e053186f9..26b1908c9 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/involvement/InvolvementDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/involvement/InvolvementDao.java @@ -30,12 +30,24 @@ import org.finos.waltz.model.person.Person; import org.finos.waltz.schema.Tables; import org.finos.waltz.schema.tables.records.InvolvementRecord; -import org.jooq.*; +import org.jooq.Condition; +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.Table; +import org.jooq.TableField; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.function.Function; import java.util.stream.IntStream; @@ -47,7 +59,6 @@ import static org.finos.waltz.schema.tables.Involvement.INVOLVEMENT; import static org.finos.waltz.schema.tables.Person.PERSON; import static org.finos.waltz.schema.tables.PersonHierarchy.PERSON_HIERARCHY; -import static org.jooq.lambda.tuple.Tuple.tuple; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/involvement_kind/InvolvementKindDao.java b/waltz-data/src/main/java/org/finos/waltz/data/involvement_kind/InvolvementKindDao.java index ba293e1c7..ba340df7c 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/involvement_kind/InvolvementKindDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/involvement_kind/InvolvementKindDao.java @@ -21,11 +21,23 @@ import org.finos.waltz.common.DateTimeUtilities; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.UserTimestamp; -import org.finos.waltz.model.involvement_kind.*; +import org.finos.waltz.model.involvement_kind.ImmutableInvolvementKind; +import org.finos.waltz.model.involvement_kind.ImmutableInvolvementKindUsageStat; +import org.finos.waltz.model.involvement_kind.ImmutableStat; +import org.finos.waltz.model.involvement_kind.InvolvementKind; +import org.finos.waltz.model.involvement_kind.InvolvementKindChangeCommand; +import org.finos.waltz.model.involvement_kind.InvolvementKindCreateCommand; +import org.finos.waltz.model.involvement_kind.InvolvementKindUsageStat; import org.finos.waltz.schema.tables.Involvement; import org.finos.waltz.schema.tables.Person; import org.finos.waltz.schema.tables.records.InvolvementKindRecord; -import org.jooq.*; +import org.jooq.CommonTableExpression; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record4; +import org.jooq.RecordMapper; +import org.jooq.SelectHavingStep; import org.jooq.exception.NoDataFoundException; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +50,9 @@ import java.util.Set; import java.util.function.Function; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toSet; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.Checks.checkOptionalIsPresent; import static org.finos.waltz.common.SetUtilities.filter; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/legal_entity/LegalEntityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/legal_entity/LegalEntityDao.java index d964adae7..3aeb71082 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/legal_entity/LegalEntityDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/legal_entity/LegalEntityDao.java @@ -4,7 +4,11 @@ import org.finos.waltz.model.legal_entity.ImmutableLegalEntity; import org.finos.waltz.model.legal_entity.LegalEntity; import org.finos.waltz.schema.tables.records.LegalEntityRecord; -import org.jooq.*; +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; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/licence/LicenceDao.java b/waltz-data/src/main/java/org/finos/waltz/data/licence/LicenceDao.java index dd0a8c841..6fc9f0faf 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/licence/LicenceDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/licence/LicenceDao.java @@ -19,13 +19,20 @@ package org.finos.waltz.data.licence; -import org.finos.waltz.schema.tables.records.LicenceRecord; import org.finos.waltz.data.JooqUtilities; import org.finos.waltz.model.UserTimestamp; import org.finos.waltz.model.licence.ImmutableLicence; import org.finos.waltz.model.licence.Licence; import org.finos.waltz.model.tally.Tally; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.LicenceRecord; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record2; +import org.jooq.RecordMapper; +import org.jooq.Select; +import org.jooq.Table; import org.jooq.exception.NoDataFoundException; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; @@ -33,10 +40,10 @@ import java.util.List; +import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.schema.tables.Licence.LICENCE; import static org.finos.waltz.schema.tables.SoftwareUsage.SOFTWARE_USAGE; import static org.finos.waltz.schema.tables.SoftwareVersionLicence.SOFTWARE_VERSION_LICENCE; -import static org.finos.waltz.common.Checks.checkNotNull; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_data_element/LogicalDataElementDao.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_data_element/LogicalDataElementDao.java index b19073ef1..b390aa558 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/logical_data_element/LogicalDataElementDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/logical_data_element/LogicalDataElementDao.java @@ -23,7 +23,11 @@ import org.finos.waltz.model.logical_data_element.ImmutableLogicalDataElement; import org.finos.waltz.model.logical_data_element.LogicalDataElement; import org.finos.waltz.schema.tables.records.LogicalDataElementRecord; -import org.jooq.*; +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; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryDao.java b/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryDao.java index a2ed72b94..62ece5d1f 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryDao.java @@ -19,12 +19,16 @@ package org.finos.waltz.data.measurable_category; import org.finos.waltz.common.DateTimeUtilities; -import org.finos.waltz.schema.tables.records.MeasurableCategoryRecord; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.model.measurable_category.ImmutableMeasurableCategory; import org.finos.waltz.model.measurable_category.MeasurableCategory; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.MeasurableCategoryRecord; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -33,7 +37,9 @@ import java.util.Optional; import java.util.Set; -import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.Tables.ENTITY_HIERARCHY; +import static org.finos.waltz.schema.Tables.MEASURABLE; +import static org.finos.waltz.schema.Tables.ORGANISATIONAL_UNIT; import static org.finos.waltz.schema.tables.MeasurableCategory.MEASURABLE_CATEGORY; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_planned_decommission/MeasurableRatingPlannedDecommissionDao.java b/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_planned_decommission/MeasurableRatingPlannedDecommissionDao.java index 811b5fc0f..2a7aa8e51 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_planned_decommission/MeasurableRatingPlannedDecommissionDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_planned_decommission/MeasurableRatingPlannedDecommissionDao.java @@ -19,7 +19,6 @@ package org.finos.waltz.data.measurable_rating_planned_decommission; -import org.finos.waltz.schema.tables.records.MeasurableRatingPlannedDecommissionRecord; import org.finos.waltz.common.DateTimeUtilities; import org.finos.waltz.common.exception.ModifyingReadOnlyRecordException; import org.finos.waltz.data.InlineSelectFieldFactory; @@ -29,30 +28,31 @@ import org.finos.waltz.model.command.DateFieldChange; import org.finos.waltz.model.measurable_rating_planned_decommission.ImmutableMeasurableRatingPlannedDecommission; import org.finos.waltz.model.measurable_rating_planned_decommission.MeasurableRatingPlannedDecommission; -import org.jooq.*; -import org.jooq.impl.DSL; -import org.jooq.lambda.tuple.Tuple; +import org.finos.waltz.schema.tables.records.MeasurableRatingPlannedDecommissionRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.RecordMapper; import org.jooq.lambda.tuple.Tuple2; -import org.jooq.lambda.tuple.Tuple3; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import java.util.Collection; import java.util.Set; -import static java.util.Collections.emptySet; -import static org.finos.waltz.common.SetUtilities.union; -import static org.finos.waltz.common.StringUtilities.notEmpty; -import static org.finos.waltz.schema.Tables.*; -import static org.finos.waltz.schema.tables.MeasurableRating.MEASURABLE_RATING; -import static org.finos.waltz.schema.tables.MeasurableRatingPlannedDecommission.MEASURABLE_RATING_PLANNED_DECOMMISSION; -import static org.finos.waltz.schema.tables.MeasurableRatingReplacement.MEASURABLE_RATING_REPLACEMENT; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime; import static org.finos.waltz.common.DateTimeUtilities.toSqlDate; import static org.finos.waltz.common.SetUtilities.asSet; +import static org.finos.waltz.common.SetUtilities.union; +import static org.finos.waltz.common.StringUtilities.notEmpty; import static org.finos.waltz.model.EntityReference.mkRef; -import static org.immutables.value.internal.$guava$.collect.$Sets.intersection; +import static org.finos.waltz.schema.Tables.MEASURABLE_CATEGORY; +import static org.finos.waltz.schema.Tables.USER_ROLE; +import static org.finos.waltz.schema.tables.MeasurableRating.MEASURABLE_RATING; +import static org.finos.waltz.schema.tables.MeasurableRatingPlannedDecommission.MEASURABLE_RATING_PLANNED_DECOMMISSION; +import static org.finos.waltz.schema.tables.MeasurableRatingReplacement.MEASURABLE_RATING_REPLACEMENT; import static org.jooq.lambda.tuple.Tuple.tuple; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_replacement/MeasurableRatingReplacementDao.java b/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_replacement/MeasurableRatingReplacementDao.java index df3442bb3..fc704ebff 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_replacement/MeasurableRatingReplacementDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/measurable_rating_replacement/MeasurableRatingReplacementDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.measurable_rating_replacement; -import org.finos.waltz.schema.tables.records.MeasurableRatingReplacementRecord; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.data.measurable_rating_planned_decommission.MeasurableRatingPlannedDecommissionDao; import org.finos.waltz.model.EntityKind; @@ -26,7 +25,12 @@ import org.finos.waltz.model.Operation; import org.finos.waltz.model.measurable_rating_replacement.ImmutableMeasurableRatingReplacement; import org.finos.waltz.model.measurable_rating_replacement.MeasurableRatingReplacement; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.MeasurableRatingReplacementRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.RecordMapper; import org.jooq.impl.DSL; import org.jooq.lambda.tuple.Tuple2; import org.springframework.beans.factory.annotation.Autowired; @@ -35,17 +39,18 @@ import java.util.Date; import java.util.Set; -import static java.util.Collections.emptySet; +import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.common.DateTimeUtilities.nowUtcTimestamp; +import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime; +import static org.finos.waltz.common.DateTimeUtilities.toSqlDate; +import static org.finos.waltz.common.SetUtilities.asSet; import static org.finos.waltz.common.SetUtilities.union; import static org.finos.waltz.common.StringUtilities.notEmpty; +import static org.finos.waltz.model.EntityReference.mkRef; import static org.finos.waltz.schema.Tables.MEASURABLE_CATEGORY; import static org.finos.waltz.schema.Tables.USER_ROLE; import static org.finos.waltz.schema.tables.MeasurableRatingPlannedDecommission.MEASURABLE_RATING_PLANNED_DECOMMISSION; import static org.finos.waltz.schema.tables.MeasurableRatingReplacement.MEASURABLE_RATING_REPLACEMENT; -import static org.finos.waltz.common.Checks.checkNotNull; -import static org.finos.waltz.common.DateTimeUtilities.*; -import static org.finos.waltz.common.SetUtilities.asSet; -import static org.finos.waltz.model.EntityReference.mkRef; import static org.jooq.lambda.tuple.Tuple.tuple; @Repository @@ -68,7 +73,7 @@ public class MeasurableRatingReplacementDao { asSet(EntityKind.APPLICATION)); - public static final RecordMapper TO_DOMAIN_MAPPER = record -> { + public static final RecordMapper TO_DOMAIN_MAPPER = record -> { MeasurableRatingReplacementRecord r = record.into(MEASURABLE_RATING_REPLACEMENT); diff --git a/waltz-data/src/main/java/org/finos/waltz/data/notification/NotificationDao.java b/waltz-data/src/main/java/org/finos/waltz/data/notification/NotificationDao.java index e3de53194..ef108c5f9 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/notification/NotificationDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/notification/NotificationDao.java @@ -23,16 +23,21 @@ import org.finos.waltz.model.notification.ImmutableNotificationSummary; import org.finos.waltz.model.notification.NotificationSummary; import org.finos.waltz.model.survey.SurveyInstanceStatus; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record2; +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; import java.util.List; -import static org.finos.waltz.schema.Tables.*; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.ListUtilities.asList; +import static org.finos.waltz.schema.Tables.*; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow_participant/PhysicalFlowParticipantDao.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow_participant/PhysicalFlowParticipantDao.java index 9e113b23a..12ad641e0 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow_participant/PhysicalFlowParticipantDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow_participant/PhysicalFlowParticipantDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.physical_flow_participant; -import org.finos.waltz.schema.tables.records.PhysicalFlowParticipantRecord; import org.finos.waltz.common.DateTimeUtilities; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.data.physical_flow.PhysicalFlowDao; @@ -27,7 +26,12 @@ import org.finos.waltz.model.physical_flow_participant.ImmutablePhysicalFlowParticipant; import org.finos.waltz.model.physical_flow_participant.ParticipationKind; import org.finos.waltz.model.physical_flow_participant.PhysicalFlowParticipant; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.PhysicalFlowParticipantRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.RecordMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +39,8 @@ import java.util.Collection; -import static org.finos.waltz.schema.tables.PhysicalFlowParticipant.PHYSICAL_FLOW_PARTICIPANT; import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.schema.tables.PhysicalFlowParticipant.PHYSICAL_FLOW_PARTICIPANT; @Repository public class PhysicalFlowParticipantDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionDao.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionDao.java index 105fde565..d0d4ab3bd 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionDao.java @@ -18,12 +18,16 @@ package org.finos.waltz.data.physical_specification_definition; -import org.finos.waltz.schema.tables.records.PhysicalSpecDefnRecord; import org.finos.waltz.model.ReleaseLifecycleStatus; import org.finos.waltz.model.physical_specification_definition.ImmutablePhysicalSpecDefinition; import org.finos.waltz.model.physical_specification_definition.PhysicalSpecDefinition; import org.finos.waltz.model.physical_specification_definition.PhysicalSpecDefinitionType; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.PhysicalSpecDefnRecord; +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; @@ -32,9 +36,9 @@ import java.util.Optional; import java.util.function.Function; -import static org.finos.waltz.schema.tables.PhysicalSpecDefn.PHYSICAL_SPEC_DEFN; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.DateTimeUtilities.nowUtcTimestamp; +import static org.finos.waltz.schema.tables.PhysicalSpecDefn.PHYSICAL_SPEC_DEFN; @Repository public class PhysicalSpecDefinitionDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionFieldDao.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionFieldDao.java index e96f56438..75bb12877 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionFieldDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification_definition/PhysicalSpecDefinitionFieldDao.java @@ -18,11 +18,15 @@ package org.finos.waltz.data.physical_specification_definition; -import org.finos.waltz.schema.tables.records.PhysicalSpecDefnFieldRecord; import org.finos.waltz.model.FieldDataType; import org.finos.waltz.model.physical_specification_definition.ImmutablePhysicalSpecDefinitionField; import org.finos.waltz.model.physical_specification_definition.PhysicalSpecDefinitionField; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.PhysicalSpecDefnFieldRecord; +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; @@ -31,8 +35,8 @@ import java.util.Optional; import java.util.function.Function; -import static org.finos.waltz.schema.tables.PhysicalSpecDefnField.PHYSICAL_SPEC_DEFN_FIELD; import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.schema.tables.PhysicalSpecDefnField.PHYSICAL_SPEC_DEFN_FIELD; @Repository public class PhysicalSpecDefinitionFieldDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java b/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java index c9008ca0a..1cfa3916a 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/rating_scheme/RatingSchemeDAO.java @@ -20,16 +20,31 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; -import org.finos.waltz.model.rating.*; +import org.finos.waltz.model.rating.ImmutableRatingScheme; +import org.finos.waltz.model.rating.ImmutableRatingSchemeItem; +import org.finos.waltz.model.rating.ImmutableRatingSchemeItemUsageCount; +import org.finos.waltz.model.rating.RatingScheme; +import org.finos.waltz.model.rating.RatingSchemeItem; +import org.finos.waltz.model.rating.RatingSchemeItemUsageCount; import org.finos.waltz.schema.Tables; import org.finos.waltz.schema.tables.records.RatingSchemeItemRecord; import org.finos.waltz.schema.tables.records.RatingSchemeRecord; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record4; +import org.jooq.RecordMapper; +import org.jooq.SelectHavingStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import static java.util.Collections.emptyList; import static java.util.Optional.ofNullable; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/rel/RelationshipKindDao.java b/waltz-data/src/main/java/org/finos/waltz/data/rel/RelationshipKindDao.java index f1224edab..c9bcb3938 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/rel/RelationshipKindDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/rel/RelationshipKindDao.java @@ -18,13 +18,18 @@ package org.finos.waltz.data.rel; -import org.finos.waltz.schema.tables.records.RelationshipKindRecord; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.rel.ImmutableRelationshipKind; import org.finos.waltz.model.rel.RelationshipKind; import org.finos.waltz.model.rel.UpdateRelationshipKindCommand; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.RelationshipKindRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; 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/scenario/ScenarioAxisItemDao.java b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioAxisItemDao.java index e017ff6e9..d5dd8dcb0 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioAxisItemDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioAxisItemDao.java @@ -19,14 +19,19 @@ package org.finos.waltz.data.scenario; -import org.finos.waltz.schema.tables.records.ScenarioAxisItemRecord; import org.finos.waltz.model.AxisOrientation; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.scenario.CloneScenarioCommand; import org.finos.waltz.model.scenario.ImmutableScenarioAxisItem; import org.finos.waltz.model.scenario.ScenarioAxisItem; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.ScenarioAxisItemRecord; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record5; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -35,11 +40,11 @@ import java.util.Collection; import java.util.List; -import static org.finos.waltz.schema.tables.ScenarioAxisItem.SCENARIO_AXIS_ITEM; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.ListUtilities.newArrayList; import static org.finos.waltz.data.InlineSelectFieldFactory.mkNameField; import static org.finos.waltz.data.JooqUtilities.readRef; +import static org.finos.waltz.schema.tables.ScenarioAxisItem.SCENARIO_AXIS_ITEM; @Repository public class ScenarioAxisItemDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioDao.java b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioDao.java index 7dd25aeee..d152c8001 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.scenario; -import org.finos.waltz.schema.tables.records.ScenarioRecord; import org.finos.waltz.common.DateTimeUtilities; import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.model.ReleaseLifecycleStatus; @@ -26,7 +25,14 @@ import org.finos.waltz.model.scenario.ImmutableScenario; import org.finos.waltz.model.scenario.Scenario; import org.finos.waltz.model.scenario.ScenarioType; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.ScenarioRecord; +import org.jooq.Condition; +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; @@ -36,9 +42,9 @@ import java.util.Collection; import java.util.function.BiFunction; -import static org.finos.waltz.schema.tables.Scenario.SCENARIO; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.DateTimeUtilities.*; +import static org.finos.waltz.schema.tables.Scenario.SCENARIO; @Repository public class ScenarioDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioRatingItemDao.java b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioRatingItemDao.java index c6b8df487..9680446a8 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioRatingItemDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/scenario/ScenarioRatingItemDao.java @@ -18,14 +18,19 @@ package org.finos.waltz.data.scenario; -import org.finos.waltz.schema.tables.records.ScenarioRatingItemRecord; import org.finos.waltz.common.DateTimeUtilities; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.scenario.ChangeScenarioCommand; import org.finos.waltz.model.scenario.CloneScenarioCommand; import org.finos.waltz.model.scenario.ImmutableScenarioRatingItem; import org.finos.waltz.model.scenario.ScenarioRatingItem; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.ScenarioRatingItemRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record11; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -33,10 +38,10 @@ import java.sql.Timestamp; import java.util.Collection; -import static org.finos.waltz.schema.tables.Scenario.SCENARIO; -import static org.finos.waltz.schema.tables.ScenarioRatingItem.SCENARIO_RATING_ITEM; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.data.JooqUtilities.readRef; +import static org.finos.waltz.schema.tables.Scenario.SCENARIO; +import static org.finos.waltz.schema.tables.ScenarioRatingItem.SCENARIO_RATING_ITEM; @Repository public class ScenarioRatingItemDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/server_usage/ServerUsageDao.java b/waltz-data/src/main/java/org/finos/waltz/data/server_usage/ServerUsageDao.java index 016ae489a..28deed5ca 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/server_usage/ServerUsageDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/server_usage/ServerUsageDao.java @@ -18,12 +18,17 @@ package org.finos.waltz.data.server_usage; -import org.finos.waltz.schema.tables.records.ServerUsageRecord; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.server_usage.ImmutableServerUsage; import org.finos.waltz.model.server_usage.ServerUsage; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.ServerUsageRecord; +import org.jooq.Condition; +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; @@ -31,10 +36,10 @@ import java.util.List; import java.util.function.Function; -import static org.finos.waltz.schema.tables.ServerUsage.SERVER_USAGE; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.DateTimeUtilities.nowUtcTimestamp; import static org.finos.waltz.common.EnumUtilities.readEnum; +import static org.finos.waltz.schema.tables.ServerUsage.SERVER_USAGE; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageDao.java b/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageDao.java index 60b32e244..bfe661dfc 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageDao.java @@ -18,7 +18,6 @@ package org.finos.waltz.data.software_catalog; -import org.finos.waltz.schema.tables.records.SoftwarePackageRecord; import org.finos.waltz.data.JooqUtilities; import org.finos.waltz.data.SearchDao; import org.finos.waltz.data.SearchUtilities; @@ -28,18 +27,29 @@ import org.finos.waltz.model.software_catalog.ImmutableSoftwarePackage; import org.finos.waltz.model.software_catalog.SoftwarePackage; import org.finos.waltz.model.tally.Tally; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.SoftwarePackageRecord; +import org.jooq.Condition; +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; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.common.SetUtilities.orderedUnion; import static org.finos.waltz.schema.tables.SoftwarePackage.SOFTWARE_PACKAGE; import static org.finos.waltz.schema.tables.SoftwareUsage.SOFTWARE_USAGE; import static org.finos.waltz.schema.tables.SoftwareVersion.SOFTWARE_VERSION; -import static org.finos.waltz.common.Checks.checkNotNull; -import static org.finos.waltz.common.SetUtilities.orderedUnion; @Repository public class SoftwarePackageDao implements SearchDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageViewDao.java b/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageViewDao.java index de23fcdb0..6d252099b 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageViewDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/software_catalog/SoftwarePackageViewDao.java @@ -18,13 +18,19 @@ package org.finos.waltz.data.software_catalog; -import org.finos.waltz.schema.tables.records.SoftwarePackageRecord; import org.finos.waltz.data.JooqUtilities; import org.finos.waltz.model.UserTimestamp; import org.finos.waltz.model.software_catalog.ImmutableSoftwarePackageView; import org.finos.waltz.model.software_catalog.SoftwarePackageView; import org.finos.waltz.model.tally.Tally; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.SoftwarePackageRecord; +import org.jooq.Condition; +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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceDao.java index 6795b9e00..e7b5fdd98 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceDao.java @@ -27,12 +27,30 @@ import org.finos.waltz.model.Severity; import org.finos.waltz.model.attestation.ImmutableSyncRecipientsResponse; import org.finos.waltz.model.attestation.SyncRecipientsResponse; -import org.finos.waltz.model.survey.*; +import org.finos.waltz.model.survey.ImmutableSurveyInstance; +import org.finos.waltz.model.survey.ImmutableSurveyRunCompletionRate; +import org.finos.waltz.model.survey.SurveyInstance; +import org.finos.waltz.model.survey.SurveyInstanceCreateCommand; +import org.finos.waltz.model.survey.SurveyInstanceStatus; +import org.finos.waltz.model.survey.SurveyInvolvementKind; +import org.finos.waltz.model.survey.SurveyRunCompletionRate; import org.finos.waltz.schema.tables.records.ChangeLogRecord; import org.finos.waltz.schema.tables.records.SurveyInstanceOwnerRecord; import org.finos.waltz.schema.tables.records.SurveyInstanceRecipientRecord; import org.finos.waltz.schema.tables.records.SurveyInstanceRecord; -import org.jooq.*; +import org.jooq.CommonTableExpression; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record2; +import org.jooq.Record3; +import org.jooq.Record6; +import org.jooq.RecordMapper; +import org.jooq.Result; +import org.jooq.Select; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +59,12 @@ import java.sql.Timestamp; import java.time.LocalDate; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceOwnerDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceOwnerDao.java index b8de478e3..beda198ee 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceOwnerDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceOwnerDao.java @@ -22,9 +22,18 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.person.Person; -import org.finos.waltz.model.survey.*; +import org.finos.waltz.model.survey.ImmutableSurveyInstance; +import org.finos.waltz.model.survey.ImmutableSurveyInstanceOwner; +import org.finos.waltz.model.survey.SurveyInstanceOwner; +import org.finos.waltz.model.survey.SurveyInstanceOwnerCreateCommand; +import org.finos.waltz.model.survey.SurveyInstanceStatus; import org.finos.waltz.schema.tables.records.SurveyInstanceOwnerRecord; -import org.jooq.*; +import org.jooq.Condition; +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; @@ -32,7 +41,9 @@ import java.util.List; import static org.finos.waltz.common.Checks.checkNotNull; -import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.Tables.PERSON; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE_OWNER; @Repository public class SurveyInstanceOwnerDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceRecipientDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceRecipientDao.java index 38bf1ab93..f25ef3188 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceRecipientDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyInstanceRecipientDao.java @@ -18,21 +18,32 @@ package org.finos.waltz.data.survey; -import org.finos.waltz.model.person.Person; -import org.finos.waltz.schema.tables.records.SurveyInstanceRecipientRecord; import org.finos.waltz.data.person.PersonDao; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; -import org.finos.waltz.model.survey.*; -import org.jooq.*; +import org.finos.waltz.model.person.Person; +import org.finos.waltz.model.survey.ImmutableSurveyInstance; +import org.finos.waltz.model.survey.ImmutableSurveyInstanceRecipient; +import org.finos.waltz.model.survey.SurveyInstanceRecipient; +import org.finos.waltz.model.survey.SurveyInstanceRecipientCreateCommand; +import org.finos.waltz.model.survey.SurveyInstanceStatus; +import org.finos.waltz.schema.tables.records.SurveyInstanceRecipientRecord; +import org.jooq.Condition; +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; import java.util.List; -import static org.finos.waltz.schema.Tables.*; import static org.finos.waltz.common.Checks.checkNotNull; +import static org.finos.waltz.schema.Tables.PERSON; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE_RECIPIENT; @Repository public class SurveyInstanceRecipientDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDao.java index d0c418d61..6827cce02 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDao.java @@ -18,14 +18,18 @@ package org.finos.waltz.data.survey; -import org.finos.waltz.schema.tables.records.SurveyQuestionRecord; import org.finos.waltz.common.StringUtilities; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.survey.ImmutableSurveyQuestion; import org.finos.waltz.model.survey.SurveyQuestion; import org.finos.waltz.model.survey.SurveyQuestionFieldType; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.SurveyQuestionRecord; +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; @@ -35,11 +39,13 @@ import java.util.Set; import java.util.function.Function; -import static org.finos.waltz.schema.Tables.*; -import static org.finos.waltz.schema.tables.SurveyQuestion.SURVEY_QUESTION; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.Checks.checkTrue; import static org.finos.waltz.model.EntityReference.mkRef; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE; +import static org.finos.waltz.schema.Tables.SURVEY_QUESTION_RESPONSE; +import static org.finos.waltz.schema.Tables.SURVEY_RUN; +import static org.finos.waltz.schema.tables.SurveyQuestion.SURVEY_QUESTION; @Repository public class SurveyQuestionDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDropdownEntryDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDropdownEntryDao.java index 7f27c47ff..5e49617b1 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDropdownEntryDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionDropdownEntryDao.java @@ -21,7 +21,11 @@ import org.finos.waltz.model.survey.ImmutableSurveyQuestionDropdownEntry; import org.finos.waltz.model.survey.SurveyQuestionDropdownEntry; import org.finos.waltz.schema.tables.records.SurveyQuestionDropdownEntryRecord; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.RecordMapper; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -32,7 +36,10 @@ import static java.util.stream.Collectors.toList; import static org.finos.waltz.common.Checks.checkNotNull; -import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE; +import static org.finos.waltz.schema.Tables.SURVEY_QUESTION; +import static org.finos.waltz.schema.Tables.SURVEY_RUN; +import static org.finos.waltz.schema.Tables.SURVEY_TEMPLATE; import static org.finos.waltz.schema.tables.SurveyQuestionDropdownEntry.SURVEY_QUESTION_DROPDOWN_ENTRY; @Repository diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionResponseDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionResponseDao.java index 010c0e860..f24fcc415 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionResponseDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyQuestionResponseDao.java @@ -23,11 +23,26 @@ import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; -import org.finos.waltz.model.survey.*; +import org.finos.waltz.model.survey.CopySurveyResponsesCommand; +import org.finos.waltz.model.survey.ImmutableSurveyInstanceQuestionResponse; +import org.finos.waltz.model.survey.ImmutableSurveyQuestionResponse; +import org.finos.waltz.model.survey.SurveyInstanceQuestionResponse; +import org.finos.waltz.model.survey.SurveyInstanceStatus; +import org.finos.waltz.model.survey.SurveyQuestionResponse; import org.finos.waltz.schema.Tables; import org.finos.waltz.schema.tables.records.SurveyQuestionListResponseRecord; import org.finos.waltz.schema.tables.records.SurveyQuestionResponseRecord; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record12; +import org.jooq.Record6; +import org.jooq.RecordMapper; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.Table; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -43,7 +58,9 @@ import java.util.function.BiConsumer; import static java.util.Optional.ofNullable; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toList; import static org.finos.waltz.common.Checks.checkNotNull; import static org.finos.waltz.common.Checks.checkTrue; import static org.finos.waltz.common.CollectionUtilities.first; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyRunDao.java b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyRunDao.java index 15d69282f..7c3aefb69 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyRunDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/survey/SurveyRunDao.java @@ -24,9 +24,17 @@ import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.HierarchyQueryScope; import org.finos.waltz.model.IdSelectionOptions; -import org.finos.waltz.model.survey.*; +import org.finos.waltz.model.survey.ImmutableSurveyRun; +import org.finos.waltz.model.survey.SurveyIssuanceKind; +import org.finos.waltz.model.survey.SurveyRun; +import org.finos.waltz.model.survey.SurveyRunChangeCommand; +import org.finos.waltz.model.survey.SurveyRunCreateCommand; +import org.finos.waltz.model.survey.SurveyRunStatus; import org.finos.waltz.schema.tables.records.SurveyRunRecord; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Select; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -41,7 +49,10 @@ import static org.finos.waltz.common.DateTimeUtilities.toLocalDate; import static org.finos.waltz.common.DateTimeUtilities.toSqlDate; import static org.finos.waltz.common.SetUtilities.fromCollection; -import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.Tables.INVOLVEMENT_GROUP_ENTRY; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE; +import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE_RECIPIENT; +import static org.finos.waltz.schema.Tables.SURVEY_RUN; @Repository public class SurveyRunDao { diff --git a/waltz-data/src/main/java/org/finos/waltz/data/tag/TagDao.java b/waltz-data/src/main/java/org/finos/waltz/data/tag/TagDao.java index 17c451043..dbe80c506 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/tag/TagDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/tag/TagDao.java @@ -18,15 +18,24 @@ package org.finos.waltz.data.tag; -import org.finos.waltz.schema.tables.records.TagRecord; -import org.finos.waltz.schema.tables.records.TagUsageRecord; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.tag.ImmutableTag; import org.finos.waltz.model.tag.ImmutableTagUsage; import org.finos.waltz.model.tag.Tag; import org.finos.waltz.model.tag.TagUsage; -import org.jooq.*; +import org.finos.waltz.schema.tables.records.TagRecord; +import org.finos.waltz.schema.tables.records.TagUsageRecord; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Record2; +import org.jooq.RecordMapper; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.SelectJoinStep; +import org.jooq.Table; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -35,10 +44,13 @@ import java.util.Map; import java.util.Set; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; +import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.toSet; +import static org.finos.waltz.model.EntityReference.mkRef; import static org.finos.waltz.schema.tables.Tag.TAG; import static org.finos.waltz.schema.tables.TagUsage.TAG_USAGE; -import static java.util.stream.Collectors.*; -import static org.finos.waltz.model.EntityReference.mkRef; import static org.jooq.lambda.tuple.Tuple.tuple; From 423c6146d94e00e86a8f0985fa41dc6e7b274ab7 Mon Sep 17 00:00:00 2001 From: David Watkins Date: Fri, 14 Jul 2023 08:51:08 +0100 Subject: [PATCH 2/2] Removing wild card imports of org.jooq.Record #6678 --- .../org/finos/waltz/data/EntityAliasPopulator.java | 8 +++++++- .../waltz/data/EntityReferenceNameResolver.java | 6 +++++- .../finos/waltz/data/InlineSelectFieldFactory.java | 7 ++++++- .../AppCountWidgetDao.java | 7 ++++++- .../AssessmentRatingWidgetDao.java | 4 +++- .../TargetAppCostWidgetDao.java | 8 +++++++- .../application/ApplicationIdSelectorFactory.java | 8 +++++++- .../data/changelog/ChangeLogSummariesDao.java | 8 +++++++- .../data/complexity/ConnectionComplexityDao.java | 8 +++++++- .../data/complexity/MeasurableComplexityDao.java | 9 ++++++++- .../waltz/data/complexity/ServerComplexityDao.java | 6 +++++- .../LogicalFlowDecoratorSummaryDao.java | 7 ++++++- .../EntityStatisticSummaryDao.java | 10 +++++++++- .../data/logical_flow/LogicalFlowStatsDao.java | 11 ++++++++++- .../measurable/MeasurableIdSelectorFactory.java | 6 +++++- .../MeasurableCategoryAlignmentViewDao.java | 8 +++++++- .../org/finos/waltz/data/orphan/OrphanDao.java | 7 ++++++- .../waltz/jobs/generators/AssessmentGenerator.java | 7 ++++++- .../jobs/generators/ChangeInitiativeGenerator.java | 6 +++++- .../waltz/jobs/harness/InvolvementHarness.java | 6 +++++- .../waltz/jobs/stats/flows/AuthFlowsRatios.java | 6 +++++- .../FlowDiagramFromMeasurableGenerator.java | 11 ++++++++++- waltz-ng/package-lock.json | 4 ++-- .../entity_hierarchy/EntityHierarchyService.java | 7 ++++++- .../QuestionEntityPredicateNamespace.java | 7 ++++++- .../waltz/service/workflow/ContextPopulator.java | 5 ++++- .../endpoints/extracts/ApplicationExtractor.java | 7 ++++++- .../extracts/AssessmentRatingExtractor.java | 5 ++++- .../extracts/CustomEnvironmentUsageExtractor.java | 11 +++++++---- .../endpoints/extracts/EntityCostExtractor.java | 14 ++++++++++---- .../endpoints/extracts/LegalEntityExtractor.java | 13 ++++++++----- .../web/endpoints/extracts/LicencesExtractor.java | 6 +++++- .../extracts/PersonApplicationExtractor.java | 8 +++++++- .../web/endpoints/extracts/SurveyRunExtractor.java | 12 +++++++++--- .../endpoints/extracts/OrgUnitExtractorTest.java | 6 +++++- 35 files changed, 221 insertions(+), 48 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 index 2cb635f37..1187101a7 100644 --- 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 index d189daf9a..fe2a9ed9b 100644 --- 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 index d5c799a31..bd5a2e44d 100644 --- 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/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AppCountWidgetDao.java b/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AppCountWidgetDao.java index ed614169a..71a01b8cd 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AppCountWidgetDao.java +++ b/waltz-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/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AssessmentRatingWidgetDao.java b/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AssessmentRatingWidgetDao.java index 81a519968..65a91cbff 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/AssessmentRatingWidgetDao.java +++ b/waltz-data/src/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/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/TargetAppCostWidgetDao.java b/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/TargetAppCostWidgetDao.java index efa8654a4..74482305b 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/aggregate_overlay_diagram/TargetAppCostWidgetDao.java +++ b/waltz-data/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/application/ApplicationIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/application/ApplicationIdSelectorFactory.java index c484d0f6c..18d31965a 100644 --- 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/changelog/ChangeLogSummariesDao.java b/waltz-data/src/main/java/org/finos/waltz/data/changelog/ChangeLogSummariesDao.java index 27636a445..84bc5c2cc 100644 --- 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 index 0da0e134c..02c8de699 100644 --- 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 index 8fceb63b4..0c8f1e5dc 100644 --- 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; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/complexity/ServerComplexityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/complexity/ServerComplexityDao.java index 2405f560c..fea0a48bb 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/complexity/ServerComplexityDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/complexity/ServerComplexityDao.java @@ -22,7 +22,11 @@ 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.Select; 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/data_flow_decorator/LogicalFlowDecoratorSummaryDao.java b/waltz-data/src/main/java/org/finos/waltz/data/data_flow_decorator/LogicalFlowDecoratorSummaryDao.java index 266e16610..256c0bc6c 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/data_flow_decorator/LogicalFlowDecoratorSummaryDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/data_flow_decorator/LogicalFlowDecoratorSummaryDao.java @@ -26,7 +26,12 @@ import org.finos.waltz.model.data_flow_decorator.DecoratorRatingSummary; import org.finos.waltz.model.data_flow_decorator.ImmutableDecoratorRatingSummary; import org.finos.waltz.model.rating.AuthoritativenessRatingValue; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Select; +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/entity_statistic/EntityStatisticSummaryDao.java b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticSummaryDao.java index b6751334a..786278810 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticSummaryDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/entity_statistic/EntityStatisticSummaryDao.java @@ -26,7 +26,15 @@ import org.finos.waltz.model.tally.ImmutableTallyPack; import org.finos.waltz.model.tally.Tally; import org.finos.waltz.model.tally.TallyPack; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.DataType; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Record3; +import org.jooq.Record4; +import org.jooq.Result; +import org.jooq.Select; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.lambda.Unchecked; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java index 5ac4517cb..6ab5f9802 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java @@ -33,7 +33,16 @@ import org.finos.waltz.model.tally.ImmutableTallyPack; import org.finos.waltz.model.tally.Tally; import org.finos.waltz.model.tally.TallyPack; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Record11; +import org.jooq.Record3; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.SelectOrderByStep; +import org.jooq.Table; import org.jooq.impl.DSL; import org.jooq.lambda.Unchecked; import org.springframework.beans.factory.annotation.Autowired; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableIdSelectorFactory.java index 346e439bb..94d12ac1d 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableIdSelectorFactory.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableIdSelectorFactory.java @@ -28,7 +28,11 @@ import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.model.HierarchyQueryScope; import org.finos.waltz.model.IdSelectionOptions; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.Record1; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.SelectOnConditionStep; import org.jooq.impl.DSL; import static org.finos.waltz.schema.Tables.*; diff --git a/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryAlignmentViewDao.java b/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryAlignmentViewDao.java index c3d0de6eb..d5d3c172d 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryAlignmentViewDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/measurable_category/MeasurableCategoryAlignmentViewDao.java @@ -26,7 +26,13 @@ import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.measurable.*; -import org.jooq.*; +import org.jooq.CommonTableExpression; +import org.jooq.DSLContext; +import org.jooq.Record1; +import org.jooq.Record11; +import org.jooq.Record3; +import org.jooq.Result; +import org.jooq.Select; 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/orphan/OrphanDao.java b/waltz-data/src/main/java/org/finos/waltz/data/orphan/OrphanDao.java index 34e88c76f..fabb0c162 100644 --- a/waltz-data/src/main/java/org/finos/waltz/data/orphan/OrphanDao.java +++ b/waltz-data/src/main/java/org/finos/waltz/data/orphan/OrphanDao.java @@ -24,7 +24,12 @@ import org.finos.waltz.model.orphan.ImmutableOrphanRelationship; import org.finos.waltz.model.orphan.OrphanRelationship; import org.finos.waltz.model.orphan.OrphanSide; -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.Select; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/AssessmentGenerator.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/AssessmentGenerator.java index 098decc9c..20f423c04 100644 --- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/AssessmentGenerator.java +++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/AssessmentGenerator.java @@ -28,7 +28,12 @@ import org.finos.waltz.schema.tables.records.RatingSchemeItemRecord; import org.finos.waltz.schema.tables.records.RatingSchemeRecord; import org.finos.waltz.service.rating_scheme.RatingSchemeService; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.SelectConditionStep; +import org.jooq.TableField; import org.jooq.impl.DSL; import org.jooq.lambda.tuple.Tuple3; import org.springframework.context.ApplicationContext; diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/ChangeInitiativeGenerator.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/ChangeInitiativeGenerator.java index 8e908edb2..26d18aa24 100644 --- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/ChangeInitiativeGenerator.java +++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/ChangeInitiativeGenerator.java @@ -27,7 +27,11 @@ import org.finos.waltz.schema.tables.records.EntityRelationshipRecord; import org.finos.waltz.schema.tables.records.InvolvementRecord; import org.finos.waltz.service.entity_hierarchy.EntityHierarchyService; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record1; +import org.jooq.SelectConditionStep; +import org.jooq.TableRecord; import org.jooq.impl.DSL; import org.jooq.lambda.tuple.Tuple2; import org.jooq.lambda.tuple.Tuple4; diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/harness/InvolvementHarness.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/harness/InvolvementHarness.java index a8ff2f824..d6ff3f2a5 100644 --- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/harness/InvolvementHarness.java +++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/harness/InvolvementHarness.java @@ -22,7 +22,11 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.service.DIConfiguration; import org.finos.waltz.service.involvement.InvolvementService; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record1; +import org.jooq.Result; +import org.jooq.SelectConditionStep; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import javax.sql.DataSource; diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/stats/flows/AuthFlowsRatios.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/stats/flows/AuthFlowsRatios.java index 91e1f59ea..54437341f 100644 --- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/stats/flows/AuthFlowsRatios.java +++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/stats/flows/AuthFlowsRatios.java @@ -8,7 +8,11 @@ import org.finos.waltz.schema.tables.LogicalFlow; import org.finos.waltz.schema.tables.LogicalFlowDecorator; import org.finos.waltz.service.DIConfiguration; -import org.jooq.*; +import org.jooq.AggregateFunction; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record4; +import org.jooq.Result; import org.jooq.impl.DSL; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/diagrams/FlowDiagramFromMeasurableGenerator.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/diagrams/FlowDiagramFromMeasurableGenerator.java index e90428ac6..61358bcc4 100644 --- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/diagrams/FlowDiagramFromMeasurableGenerator.java +++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/diagrams/FlowDiagramFromMeasurableGenerator.java @@ -6,7 +6,16 @@ import org.finos.waltz.model.IdSelectionOptions; import org.finos.waltz.schema.tables.*; import org.finos.waltz.service.DIConfiguration; -import org.jooq.*; +import org.jooq.CaseConditionStep; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.Record4; +import org.jooq.Record6; +import org.jooq.Select; +import org.jooq.SelectConditionStep; +import org.jooq.SelectJoinStep; import org.jooq.impl.DSL; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/waltz-ng/package-lock.json b/waltz-ng/package-lock.json index 40186b1c3..e64526f69 100644 --- a/waltz-ng/package-lock.json +++ b/waltz-ng/package-lock.json @@ -1,12 +1,12 @@ { "name": "waltz-ng", - "version": "1.50.0", + "version": "1.52.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "waltz-ng", - "version": "1.50.0", + "version": "1.52.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/waltz-service/src/main/java/org/finos/waltz/service/entity_hierarchy/EntityHierarchyService.java b/waltz-service/src/main/java/org/finos/waltz/service/entity_hierarchy/EntityHierarchyService.java index ecb651c03..6bf7c666f 100644 --- a/waltz-service/src/main/java/org/finos/waltz/service/entity_hierarchy/EntityHierarchyService.java +++ b/waltz-service/src/main/java/org/finos/waltz/service/entity_hierarchy/EntityHierarchyService.java @@ -38,7 +38,12 @@ import org.finos.waltz.model.entity_hierarchy.ImmutableEntityHierarchyItem; 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.Select; +import org.jooq.Table; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/waltz-service/src/main/java/org/finos/waltz/service/survey/inclusion_evaluator/QuestionEntityPredicateNamespace.java b/waltz-service/src/main/java/org/finos/waltz/service/survey/inclusion_evaluator/QuestionEntityPredicateNamespace.java index 5204b9a2b..4a71dd8d5 100644 --- a/waltz-service/src/main/java/org/finos/waltz/service/survey/inclusion_evaluator/QuestionEntityPredicateNamespace.java +++ b/waltz-service/src/main/java/org/finos/waltz/service/survey/inclusion_evaluator/QuestionEntityPredicateNamespace.java @@ -23,7 +23,12 @@ import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.survey.SurveyQuestion; import org.finos.waltz.model.survey.SurveyQuestionResponse; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record1; +import org.jooq.SelectConditionStep; +import org.jooq.Table; import org.jooq.impl.DSL; import java.util.List; diff --git a/waltz-service/src/main/java/org/finos/waltz/service/workflow/ContextPopulator.java b/waltz-service/src/main/java/org/finos/waltz/service/workflow/ContextPopulator.java index 7c39821b6..dde751a90 100644 --- a/waltz-service/src/main/java/org/finos/waltz/service/workflow/ContextPopulator.java +++ b/waltz-service/src/main/java/org/finos/waltz/service/workflow/ContextPopulator.java @@ -6,7 +6,10 @@ import org.finos.waltz.schema.tables.AssessmentRating; import org.finos.waltz.schema.tables.RatingSchemeItem; import org.finos.waltz.schema.tables.SurveyQuestionResponse; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record6; +import org.jooq.SelectConditionStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/ApplicationExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/ApplicationExtractor.java index 323b9e955..122007df5 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/ApplicationExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/ApplicationExtractor.java @@ -23,7 +23,12 @@ import org.finos.waltz.data.application.ApplicationIdSelectorFactory; import org.finos.waltz.model.IdSelectionOptions; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record1; +import org.jooq.Record8; +import org.jooq.Select; +import org.jooq.SelectConditionStep; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/AssessmentRatingExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/AssessmentRatingExtractor.java index 1c39ada58..49208164c 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/AssessmentRatingExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/AssessmentRatingExtractor.java @@ -23,7 +23,10 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.assessment_definition.AssessmentDefinition; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record11; +import org.jooq.SelectConditionStep; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/CustomEnvironmentUsageExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/CustomEnvironmentUsageExtractor.java index d5e3aa7da..6e06836a8 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/CustomEnvironmentUsageExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/CustomEnvironmentUsageExtractor.java @@ -18,18 +18,21 @@ package org.finos.waltz.web.endpoints.extracts; -import org.finos.waltz.schema.tables.Application; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; +import org.finos.waltz.schema.tables.Application; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.SelectSeekStep3; +import org.jooq.SelectSelectStep; import org.jooq.impl.DSL; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import static org.finos.waltz.schema.Tables.*; -import static org.finos.waltz.web.WebUtilities.getEntityReference; import static java.lang.String.format; +import static org.finos.waltz.schema.Tables.*; import static org.jooq.lambda.tuple.Tuple.tuple; import static spark.Spark.get; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/EntityCostExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/EntityCostExtractor.java index 82ce4e0a0..3b82a1658 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/EntityCostExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/EntityCostExtractor.java @@ -18,25 +18,31 @@ package org.finos.waltz.web.endpoints.extracts; -import org.finos.waltz.service.settings.SettingsService; import org.finos.waltz.data.GenericSelector; import org.finos.waltz.data.GenericSelectorFactory; import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.IdSelectionOptions; +import org.finos.waltz.service.settings.SettingsService; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.SelectJoinStep; +import org.jooq.SelectSeekStep1; +import org.jooq.SelectSeekStep2; import org.jooq.impl.DSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import static org.finos.waltz.schema.Tables.COST; -import static org.finos.waltz.schema.Tables.COST_KIND; import static java.lang.String.format; import static org.finos.waltz.common.ListUtilities.newArrayList; +import static org.finos.waltz.schema.Tables.COST; +import static org.finos.waltz.schema.Tables.COST_KIND; import static spark.Spark.get; import static spark.Spark.post; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LegalEntityExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LegalEntityExtractor.java index 4ae29ce67..268573bf3 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LegalEntityExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LegalEntityExtractor.java @@ -21,11 +21,13 @@ import org.finos.waltz.data.InlineSelectFieldFactory; import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityReference; -import org.finos.waltz.model.IdSelectionOptions; -import org.finos.waltz.model.legal_entity.LegalEntityRelationshipView; import org.finos.waltz.service.legal_entity.LegalEntityRelationshipService; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record9; +import org.jooq.SelectSeekStep2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,8 +35,9 @@ import static java.lang.String.format; import static org.finos.waltz.common.ListUtilities.newArrayList; -import static org.finos.waltz.model.IdSelectionOptions.mkOpts; -import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.Tables.LEGAL_ENTITY; +import static org.finos.waltz.schema.Tables.LEGAL_ENTITY_RELATIONSHIP; +import static org.finos.waltz.schema.Tables.LEGAL_ENTITY_RELATIONSHIP_KIND; import static spark.Spark.get; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java index 542e13664..7d0483b6e 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java @@ -22,7 +22,11 @@ import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.IdSelectionOptions; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record1; +import org.jooq.Record8; +import org.jooq.Select; +import org.jooq.SelectConditionStep; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PersonApplicationExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PersonApplicationExtractor.java index cc248cd6a..1183397e2 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PersonApplicationExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PersonApplicationExtractor.java @@ -21,7 +21,13 @@ import org.finos.waltz.model.EntityKind; import org.finos.waltz.model.EntityLifecycleStatus; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record9; +import org.jooq.SelectConditionStep; +import org.jooq.SelectOnConditionStep; +import org.jooq.SelectOrderByStep; import org.jooq.impl.DSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/SurveyRunExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/SurveyRunExtractor.java index b522f4c4e..7d749c01b 100644 --- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/SurveyRunExtractor.java +++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/SurveyRunExtractor.java @@ -27,7 +27,13 @@ import org.finos.waltz.model.EntityReference; import org.finos.waltz.model.IdSelectionOptions; import org.finos.waltz.web.WebUtilities; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Record14; +import org.jooq.SelectConditionStep; +import org.jooq.SelectSeekStep2; +import org.jooq.SelectWhereStep; import org.jooq.impl.DSL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +43,10 @@ import java.sql.Date; import java.util.List; -import static org.finos.waltz.schema.Tables.*; -import static org.finos.waltz.schema.tables.Application.APPLICATION; import static java.lang.String.format; import static org.finos.waltz.model.IdSelectionOptions.mkOpts; +import static org.finos.waltz.schema.Tables.*; +import static org.finos.waltz.schema.tables.Application.APPLICATION; import static spark.Spark.get; diff --git a/waltz-web/src/test/java/org/finos/waltz/web/endpoints/extracts/OrgUnitExtractorTest.java b/waltz-web/src/test/java/org/finos/waltz/web/endpoints/extracts/OrgUnitExtractorTest.java index c11d1e0ad..b7d566df6 100644 --- a/waltz-web/src/test/java/org/finos/waltz/web/endpoints/extracts/OrgUnitExtractorTest.java +++ b/waltz-web/src/test/java/org/finos/waltz/web/endpoints/extracts/OrgUnitExtractorTest.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.databind.JsonNode; import org.finos.waltz.common.JacksonUtilities; import org.finos.waltz.schema.tables.records.OrganisationalUnitRecord; -import org.jooq.*; +import org.jooq.DSLContext; +import org.jooq.Record6; +import org.jooq.Result; +import org.jooq.SQLDialect; +import org.jooq.SelectJoinStep; import org.jooq.impl.DSL; import org.jooq.tools.jdbc.MockConnection; import org.jooq.tools.jdbc.MockDataProvider;