From f223fd093b8e6a3bed046469fd7a3e2b15892675 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Sat, 3 Feb 2024 21:15:22 -0500 Subject: [PATCH 1/3] update util package restructure --- .../hhs/aspr/ms/gcm/nucleus/ActorContext.java | 2 +- .../gov/hhs/aspr/ms/gcm/nucleus/DataManager.java | 2 +- .../aspr/ms/gcm/nucleus/DataManagerContext.java | 2 +- .../aspr/ms/gcm/nucleus/DimensionContext.java | 2 +- .../gov/hhs/aspr/ms/gcm/nucleus/EventFilter.java | 2 +- .../gov/hhs/aspr/ms/gcm/nucleus/Experiment.java | 2 +- .../aspr/ms/gcm/nucleus/ExperimentContext.java | 2 +- .../ms/gcm/nucleus/ExperimentParameterData.java | 2 +- .../ms/gcm/nucleus/ExperimentStateManager.java | 4 ++-- .../ms/gcm/nucleus/IdentifiableFunction.java | 2 +- .../ms/gcm/nucleus/IdentifiableFunctionMap.java | 2 +- .../hhs/aspr/ms/gcm/nucleus/NucleusError.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/PlanQueueData.java | 2 +- .../java/gov/hhs/aspr/ms/gcm/nucleus/Plugin.java | 2 +- .../hhs/aspr/ms/gcm/nucleus/PluginContext.java | 2 +- .../gcm/nucleus/PluginDataBuilderContainer.java | 2 +- .../ms/gcm/nucleus/PluginDataBuilderContext.java | 2 +- .../hhs/aspr/ms/gcm/nucleus/ReportContext.java | 2 +- .../hhs/aspr/ms/gcm/nucleus/SimplePluginId.java | 2 +- .../gov/hhs/aspr/ms/gcm/nucleus/Simulation.java | 14 +++++++------- .../hhs/aspr/ms/gcm/nucleus/SimulationState.java | 2 +- .../runcontinuityplugin/RunContinuityError.java | 4 ++-- .../runcontinuityplugin/RunContinuityPlugin.java | 2 +- .../testsupport/testplugin/TestActorPlan.java | 2 +- .../testplugin/TestDataManagerPlan.java | 2 +- .../testsupport/testplugin/TestError.java | 4 ++-- .../testplugin/TestOutputConsumer.java | 4 ++-- .../testsupport/testplugin/TestPlugin.java | 2 +- .../testsupport/testplugin/TestPluginData.java | 2 +- .../testplugin/TestPluginFactory.java | 2 +- .../testsupport/testplugin/TestReportPlan.java | 2 +- .../testsupport/testplugin/TestSimulation.java | 2 +- .../globalproperties/GlobalPropertiesPlugin.java | 3 +-- .../GlobalPropertiesDataManager.java | 2 +- .../datamanagers/GlobalPropertiesPluginData.java | 2 +- .../events/GlobalPropertyDefinitionEvent.java | 2 +- .../reports/GlobalPropertyReport.java | 2 +- .../reports/GlobalPropertyReportPluginData.java | 2 +- .../support/GlobalPropertiesError.java | 4 ++-- .../support/GlobalPropertyDimension.java | 2 +- .../support/GlobalPropertyInitialization.java | 2 +- .../support/SimpleGlobalPropertyId.java | 2 +- .../GlobalPropertiesTestPluginFactory.java | 4 ++-- .../aspr/ms/gcm/plugins/groups/GroupsPlugin.java | 2 +- .../groups/datamanagers/GroupsDataManager.java | 2 +- .../groups/datamanagers/GroupsPluginData.java | 4 ++-- .../events/GroupPropertyDefinitionEvent.java | 2 +- .../reports/GroupPopulationReportPluginData.java | 2 +- .../reports/GroupPropertyReportPluginData.java | 2 +- .../groups/support/GroupConstructionInfo.java | 2 +- .../gcm/plugins/groups/support/GroupError.java | 4 ++-- .../ms/gcm/plugins/groups/support/GroupId.java | 2 +- .../gcm/plugins/groups/support/GroupLabeler.java | 2 +- .../groups/support/GroupMemberFilter.java | 2 +- .../GroupPropertyDefinitionInitialization.java | 2 +- .../groups/support/GroupPropertyDimension.java | 2 +- .../groups/support/GroupPropertyValue.java | 2 +- .../groups/support/GroupTypeCountMap.java | 2 +- .../support/GroupTypesForPersonFilter.java | 2 +- .../plugins/groups/support/GroupsContext.java | 2 +- .../GroupsForPersonAndGroupTypeFilter.java | 2 +- .../groups/support/GroupsForPersonFilter.java | 2 +- .../testsupport/GroupsTestPluginFactory.java | 6 +++--- .../gcm/plugins/materials/MaterialsPlugin.java | 2 +- .../datamangers/MaterialsDataManager.java | 4 ++-- .../datamangers/MaterialsPluginData.java | 2 +- .../events/BatchPropertyDefinitionEvent.java | 2 +- .../events/BatchPropertyUpdateEvent.java | 2 +- .../events/MaterialIdAdditionEvent.java | 2 +- .../events/MaterialsProducerAdditionEvent.java | 2 +- ...MaterialsProducerPropertyDefinitionEvent.java | 2 +- .../reports/BatchStatusReportPluginData.java | 2 +- ...aterialsProducerPropertyReportPluginData.java | 2 +- ...aterialsProducerResourceReportPluginData.java | 2 +- .../materials/reports/StageReportPluginData.java | 2 +- .../materials/support/BatchConstructionInfo.java | 2 +- .../BatchPropertyDefinitionInitialization.java | 2 +- .../materials/support/MaterialsError.java | 4 ++-- .../MaterialsProducerConstructionData.java | 2 +- ...ProducerPropertyDefinitionInitialization.java | 2 +- .../materials/support/StageConversionInfo.java | 2 +- .../testsupport/MaterialsTestPluginFactory.java | 4 ++-- .../gcm/plugins/partitions/PartitionsPlugin.java | 2 +- .../datamanagers/PartitionsDataManager.java | 2 +- .../DegeneratePopulationPartitionImpl.java | 2 +- .../gcm/plugins/partitions/support/LabelSet.java | 2 +- .../partitions/support/PartitionError.java | 4 ++-- .../partitions/support/PartitionsContext.java | 2 +- .../support/PopulationPartitionImpl.java | 4 ++-- .../containers/TreeBitSetPeopleContainer.java | 2 +- .../partitions/support/filters/AndFilter.java | 2 +- .../partitions/support/filters/Filter.java | 2 +- .../partitions/support/filters/NotFilter.java | 2 +- .../partitions/support/filters/OrFilter.java | 2 +- .../testsupport/PartitionsTestPluginFactory.java | 2 +- .../testsupport/TestPartitionsContext.java | 2 +- .../attributes/AttributesDataManager.java | 2 +- .../testsupport/attributes/AttributesPlugin.java | 4 ++-- .../attributes/AttributesPluginData.java | 2 +- .../attributes/support/AttributeDefinition.java | 2 +- .../attributes/support/AttributeError.java | 4 ++-- .../attributes/support/AttributeFilter.java | 2 +- .../attributes/support/AttributeLabeler.java | 2 +- .../people/datamanagers/PeopleDataManager.java | 2 +- .../people/datamanagers/PeoplePluginData.java | 2 +- .../people/events/PersonAdditionEvent.java | 2 +- .../events/PersonImminentAdditionEvent.java | 2 +- .../events/PersonImminentRemovalEvent.java | 2 +- .../people/events/PersonRemovalEvent.java | 2 +- .../people/support/PersonConstructionData.java | 2 +- .../gcm/plugins/people/support/PersonError.java | 4 ++-- .../ms/gcm/plugins/people/support/PersonId.java | 2 +- .../gcm/plugins/people/support/PersonRange.java | 2 +- .../testsupport/PeopleTestPluginFactory.java | 2 +- .../personproperties/PersonPropertiesPlugin.java | 2 +- .../PersonPropertiesDataManager.java | 2 +- .../datamanagers/PersonPropertiesPluginData.java | 2 +- .../events/PersonPropertyDefinitionEvent.java | 2 +- .../reports/PersonPropertyReportPluginData.java | 2 +- .../PersonPropertyDefinitionInitialization.java | 2 +- .../support/PersonPropertyDimension.java | 2 +- .../support/PersonPropertyError.java | 4 ++-- .../support/PersonPropertyFilter.java | 2 +- .../support/PersonPropertyLabeler.java | 2 +- .../PersonPropertiesTestPluginFactory.java | 4 ++-- .../support/BooleanPropertyManager.java | 2 +- .../support/DoublePropertyManager.java | 2 +- .../properties/support/EnumPropertyManager.java | 2 +- .../properties/support/FloatPropertyManager.java | 2 +- .../support/IndexedPropertyManager.java | 2 +- .../properties/support/IntPropertyManager.java | 2 +- .../support/ObjectPropertyManager.java | 2 +- .../properties/support/PropertyDefinition.java | 2 +- .../properties/support/PropertyError.java | 4 ++-- .../arraycontainers/DoubleValueContainer.java | 2 +- .../arraycontainers/FloatValueContainer.java | 2 +- .../arraycontainers/IntValueContainer.java | 2 +- .../ms/gcm/plugins/regions/RegionsPlugin.java | 2 +- .../regions/datamanagers/RegionsDataManager.java | 4 ++-- .../regions/datamanagers/RegionsPluginData.java | 2 +- .../regions/events/RegionAdditionEvent.java | 2 +- .../events/RegionPropertyDefinitionEvent.java | 2 +- .../regions/reports/RegionPropertyReport.java | 2 +- .../reports/RegionPropertyReportPluginData.java | 2 +- .../regions/reports/RegionTransferReport.java | 4 ++-- .../reports/RegionTransferReportPluginData.java | 2 +- .../regions/support/RegionConstructionData.java | 2 +- .../gcm/plugins/regions/support/RegionError.java | 4 ++-- .../plugins/regions/support/RegionFilter.java | 2 +- .../plugins/regions/support/RegionLabeler.java | 2 +- .../RegionPropertyDefinitionInitialization.java | 2 +- .../regions/support/RegionPropertyDimension.java | 2 +- .../testsupport/RegionsTestPluginFactory.java | 4 ++-- .../reports/support/NIOReportItemHandler.java | 2 +- .../plugins/reports/support/PeriodicReport.java | 2 +- .../support/PeriodicReportPluginData.java | 2 +- .../gcm/plugins/reports/support/ReportError.java | 4 ++-- .../plugins/reports/support/ReportHeader.java | 2 +- .../gcm/plugins/reports/support/ReportItem.java | 2 +- .../reports/support/SimpleReportLabel.java | 2 +- .../gcm/plugins/resources/ResourcesPlugin.java | 2 +- .../datamanagers/ResourcesDataManager.java | 4 ++-- .../datamanagers/ResourcesPluginData.java | 2 +- .../events/ResourceIdAdditionEvent.java | 2 +- .../events/ResourcePropertyDefinitionEvent.java | 2 +- .../resources/reports/PersonResourceReport.java | 4 ++-- .../reports/PersonResourceReportPluginData.java | 2 +- .../ResourcePropertyReportPluginData.java | 2 +- .../resources/reports/ResourceReport.java | 2 +- .../reports/ResourceReportPluginData.java | 2 +- .../plugins/resources/support/ResourceError.java | 4 ++-- .../resources/support/ResourceFilter.java | 2 +- .../resources/support/ResourceLabeler.java | 2 +- .../support/ResourcePropertyInitialization.java | 2 +- .../testsupport/ResourcesTestPluginFactory.java | 4 ++-- .../plugins/stochastics/StochasticsPlugin.java | 2 +- .../datamanagers/StochasticsDataManager.java | 2 +- .../datamanagers/StochasticsPluginData.java | 2 +- .../support/SimpleRandomNumberGeneratorId.java | 2 +- .../stochastics/support/StochasticsError.java | 4 ++-- .../plugins/stochastics/support/WellState.java | 2 +- .../StochasticsTestPluginFactory.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_ActorContext.java | 10 +++++----- .../gov/hhs/aspr/ms/gcm/nucleus/AT_ActorId.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_DataManager.java | 4 ++-- .../ms/gcm/nucleus/AT_DataManagerContext.java | 10 +++++----- .../aspr/ms/gcm/nucleus/AT_DataManagerId.java | 6 +++--- .../hhs/aspr/ms/gcm/nucleus/AT_Dimension.java | 2 +- .../aspr/ms/gcm/nucleus/AT_DimesionContext.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_EventFilter.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_Experiment.java | 10 +++++----- .../ms/gcm/nucleus/AT_ExperimentContext.java | 8 ++++---- .../gcm/nucleus/AT_ExperimentParameterData.java | 8 ++++---- .../gcm/nucleus/AT_ExperimentStateManager.java | 8 ++++---- .../gcm/nucleus/AT_ExperimentStatusConsole.java | 4 ++-- .../ms/gcm/nucleus/AT_IdentifiableFunction.java | 4 ++-- .../gcm/nucleus/AT_IdentifiableFunctionMap.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_NucleusError.java | 2 +- .../gov/hhs/aspr/ms/gcm/nucleus/AT_Plan.java | 6 +++--- .../aspr/ms/gcm/nucleus/AT_PlanQueueData.java | 6 +++--- .../gov/hhs/aspr/ms/gcm/nucleus/AT_Plugin.java | 6 +++--- .../aspr/ms/gcm/nucleus/AT_PluginContext.java | 6 +++--- .../gcm/nucleus/AT_PluginDataBuilderContext.java | 4 ++-- .../ms/gcm/nucleus/AT_PrioritizedPlanData.java | 4 ++-- .../aspr/ms/gcm/nucleus/AT_ReportContext.java | 8 ++++---- .../gov/hhs/aspr/ms/gcm/nucleus/AT_ReportId.java | 4 ++-- .../aspr/ms/gcm/nucleus/AT_SimplePluginId.java | 4 ++-- .../hhs/aspr/ms/gcm/nucleus/AT_Simulation.java | 10 +++++----- .../aspr/ms/gcm/nucleus/AT_SimulationState.java | 6 +++--- .../gcm/nucleus/AT_SimulationStateCollector.java | 6 +++--- .../ms/gcm/nucleus/AT_StatusConsoleState.java | 4 ++-- .../AT_RunContinuityActor.java | 6 +++--- .../AT_RunContinuityError.java | 2 +- .../AT_RunContinuityPlanData.java | 4 ++-- .../AT_RunContinuityPlugin.java | 6 +++--- .../AT_RunContinuityPluginData.java | 6 +++--- .../AT_RunContinuityPluginId.java | 2 +- .../testsupport/testplugin/AT_TestActor.java | 6 +++--- .../testsupport/testplugin/AT_TestActorPlan.java | 6 +++--- .../testplugin/AT_TestDataManager.java | 8 ++++---- .../testplugin/AT_TestDataManagerPlan.java | 6 +++--- .../testsupport/testplugin/AT_TestError.java | 2 +- .../testplugin/AT_TestOutputConsumer.java | 10 +++++----- .../testplugin/AT_TestPlanDataManager.java | 6 +++--- .../testsupport/testplugin/AT_TestPlugin.java | 4 ++-- .../testplugin/AT_TestPluginData.java | 6 +++--- .../testplugin/AT_TestPluginFactory.java | 6 +++--- .../testsupport/testplugin/AT_TestPluginId.java | 2 +- .../testsupport/testplugin/AT_TestReport.java | 6 +++--- .../testplugin/AT_TestReportPlan.java | 6 +++--- .../testplugin/AT_TestScenarioReport.java | 4 ++-- .../testplugin/AT_TestSimulation.java | 6 +++--- .../aspr/ms/gcm/nucleus/util/AT_TriConsumer.java | 4 ++-- .../AT_GlobalPropertiesPlugin.java | 2 +- .../AT_GlobalPropertiesPluginId.java | 2 +- .../AT_GlobalPropertiesDataManager.java | 10 +++++----- .../AT_GlobalPropertiesPluginData.java | 6 +++--- .../events/AT_GlobalPropertyDefinitionEvent.java | 6 +++--- .../events/AT_GlobalPropertyUpdateEvent.java | 4 ++-- .../reports/AT_GlobalPropertyReport.java | 6 +++--- .../AT_GlobalPropertyReportPluginData.java | 6 +++--- .../support/AT_GlobalPropertiesError.java | 2 +- .../support/AT_GlobalPropertyDimension.java | 6 +++--- .../support/AT_GlobalPropertyInitialization.java | 4 ++-- .../support/AT_SimpleGlobalPropertyId.java | 4 ++-- .../AT_GlobalPropertiesTestPluginFactory.java | 8 ++++---- .../AT_TestAuxiliaryGlobalPropertyId.java | 6 +++--- .../testsupport/AT_TestGlobalPropertyId.java | 6 +++--- .../ms/gcm/plugins/groups/AT_GroupsPlugin.java | 2 +- .../ms/gcm/plugins/groups/AT_GroupsPluginId.java | 2 +- .../datamanagers/AT_GroupsDataManager.java | 14 +++++++------- .../AT_GroupsDataManager_Continuity.java | 2 +- .../groups/datamanagers/AT_GroupsPluginData.java | 10 +++++----- .../groups/events/AT_GroupAdditionEvent.java | 4 ++-- .../events/AT_GroupImminentRemovalEvent.java | 4 ++-- .../events/AT_GroupMembershipAdditionEvent.java | 4 ++-- .../events/AT_GroupMembershipRemovalEvent.java | 4 ++-- .../events/AT_GroupPropertyDefinitionEvent.java | 6 +++--- .../events/AT_GroupPropertyUpdateEvent.java | 4 ++-- .../groups/events/AT_GroupTypeAdditionEvent.java | 4 ++-- .../groups/reports/AT_GroupPopulationReport.java | 4 ++-- .../AT_GroupPopulationReportPluginData.java | 6 +++--- .../groups/reports/AT_GroupPropertyReport.java | 6 +++--- .../AT_GroupPropertyReportPluginData.java | 8 ++++---- .../groups/support/AT_GroupConstructionInfo.java | 6 +++--- .../plugins/groups/support/AT_GroupError.java | 2 +- .../gcm/plugins/groups/support/AT_GroupId.java | 6 +++--- .../plugins/groups/support/AT_GroupLabeler.java | 4 ++-- .../groups/support/AT_GroupMemberFilter.java | 6 +++--- ...AT_GroupPropertyDefinitionInitialization.java | 6 +++--- .../support/AT_GroupPropertyDimension.java | 6 +++--- .../groups/support/AT_GroupPropertyValue.java | 8 ++++---- .../plugins/groups/support/AT_GroupSampler.java | 2 +- .../groups/support/AT_GroupTypeCountMap.java | 6 +++--- .../support/AT_GroupTypesForPersonFilter.java | 8 ++++---- .../AT_GroupsForPersonAndGroupTypeFilter.java | 8 ++++---- .../groups/support/AT_GroupsForPersonFilter.java | 8 ++++---- .../testsupport/AT_GroupsTestPluginFactory.java | 10 +++++----- .../AT_TestAuxiliaryGroupPropertyId.java | 4 ++-- .../testsupport/AT_TestAuxiliaryGroupTypeId.java | 6 +++--- .../testsupport/AT_TestGroupPropertyId.java | 4 ++-- .../groups/testsupport/AT_TestGroupTypeId.java | 6 +++--- .../plugins/materials/AT_MaterialsPlugin.java | 4 ++-- .../plugins/materials/AT_MaterialsPluginId.java | 2 +- .../datamanagers/AT_MaterialsDataManager.java | 12 ++++++------ .../AT_MaterialsDataManager_Continuity.java | 4 ++-- .../datamanagers/AT_MaterialsPluginData.java | 8 ++++---- .../materials/events/AT_BatchAdditionEvent.java | 4 ++-- .../events/AT_BatchAmountUpdateEvent.java | 4 ++-- .../events/AT_BatchImminentRemovalEvent.java | 4 ++-- .../events/AT_BatchPropertyDefinitionEvent.java | 6 +++--- .../events/AT_BatchPropertyUpdateEvent.java | 6 +++--- .../events/AT_MaterialIdAdditionEvent.java | 6 +++--- .../AT_MaterialsProducerAdditionEvent.java | 6 +++--- ...MaterialsProducerPropertyDefinitionEvent.java | 6 +++--- .../AT_MaterialsProducerPropertyUpdateEvent.java | 4 ++-- .../AT_MaterialsProducerResourceUpdateEvent.java | 4 ++-- .../materials/events/AT_StageAdditionEvent.java | 4 ++-- .../events/AT_StageImminentRemovalEvent.java | 4 ++-- .../AT_StageMaterialsProducerUpdateEvent.java | 4 ++-- .../events/AT_StageMembershipAdditionEvent.java | 4 ++-- .../events/AT_StageMembershipRemovalEvent.java | 4 ++-- .../events/AT_StageOfferUpdateEvent.java | 4 ++-- .../materials/reports/AT_BatchStatusReport.java | 6 +++--- .../reports/AT_BatchStatusReportPluginData.java | 6 +++--- .../AT_MaterialsProducerPropertyReport.java | 6 +++--- ...aterialsProducerPropertyReportPluginData.java | 6 +++--- .../AT_MaterialsProducerResourceReport.java | 6 +++--- ...aterialsProducerResourceReportPluginData.java | 6 +++--- .../materials/reports/AT_StageReport.java | 8 ++++---- .../reports/AT_StageReportPluginData.java | 6 +++--- .../support/AT_BatchConstructionInfo.java | 6 +++--- .../plugins/materials/support/AT_BatchId.java | 4 ++-- ...AT_BatchPropertyDefinitionInitialization.java | 6 +++--- .../materials/support/AT_MaterialsError.java | 2 +- .../AT_MaterialsProducerConstructionData.java | 6 +++--- ...ProducerPropertyDefinitionInitialization.java | 6 +++--- .../support/AT_StageConversionInfo.java | 6 +++--- .../plugins/materials/support/AT_StageId.java | 4 ++-- .../AT_MaterialsTestPluginFactory.java | 8 ++++---- .../AT_TestBatchConstructionInfo.java | 6 +++--- .../testsupport/AT_TestBatchPropertyId.java | 4 ++-- .../materials/testsupport/AT_TestMaterialId.java | 4 ++-- .../testsupport/AT_TestMaterialsProducerId.java | 4 ++-- .../AT_TestMaterialsProducerPropertyId.java | 4 ++-- .../plugins/partitions/AT_PartitionsPlugin.java | 4 ++-- .../partitions/AT_PartitionsPluginId.java | 2 +- .../datamanagers/AT_PartitionsDataManager.java | 10 +++++----- .../AT_PartitionsDataManager_Continuity.java | 4 ++-- .../datamanagers/AT_PartitionsPluginData.java | 2 +- .../AT_DegeneratePopulationPartitionImpl.java | 8 ++++---- .../plugins/partitions/support/AT_Equality.java | 6 +++--- .../partitions/support/AT_FilterSensitivity.java | 4 ++-- .../plugins/partitions/support/AT_LabelSet.java | 4 ++-- .../support/AT_LabelerSensitivity.java | 4 ++-- .../plugins/partitions/support/AT_Partition.java | 4 ++-- .../partitions/support/AT_PartitionError.java | 2 +- .../partitions/support/AT_PartitionSampler.java | 2 +- .../support/AT_PopulationPartitionImpl.java | 6 +++--- .../containers/AT_BasePeopleContainer.java | 4 ++-- .../containers/AT_IntSetPeopleContainer.java | 6 +++--- .../containers/AT_TreeBitSetPeopleContainer.java | 6 +++--- .../support/containers/MT_ArrayIntSet.java | 2 +- .../partitions/support/filters/AT_AndFilter.java | 8 ++++---- .../support/filters/AT_FalseFilter.java | 4 ++-- .../partitions/support/filters/AT_Filter.java | 4 ++-- .../partitions/support/filters/AT_NotFilter.java | 8 ++++---- .../partitions/support/filters/AT_OrFilter.java | 8 ++++---- .../support/filters/AT_TrueFilter.java | 4 ++-- .../AT_FunctionalAttributeLabeler.java | 2 +- .../AT_PartitionsTestPluginFactory.java | 6 +++--- .../testsupport/AT_TestPartitionsContext.java | 4 ++-- .../attributes/AT_AttributesDataManager.java | 10 +++++----- .../attributes/AT_AttributesPlugin.java | 2 +- .../attributes/AT_AttributesPluginData.java | 8 ++++---- .../attributes/AT_AttributesPluginId.java | 2 +- .../events/AT_AttributeUpdateEvent.java | 4 ++-- .../support/AT_AttributeDefinition.java | 4 ++-- .../attributes/support/AT_AttributeError.java | 2 +- .../attributes/support/AT_AttributeFilter.java | 10 +++++----- .../attributes/support/AT_AttributeLabeler.java | 8 ++++---- .../attributes/support/AT_SimpleAttributeId.java | 4 ++-- .../attributes/support/AT_TestAttributeId.java | 6 +++--- .../ms/gcm/plugins/people/AT_PeoplePlugin.java | 2 +- .../ms/gcm/plugins/people/AT_PeoplePluginId.java | 2 +- .../datamanagers/AT_PeopleDataManager.java | 6 +++--- .../people/datamanagers/AT_PeoplePluginData.java | 6 +++--- .../people/events/AT_PersonAdditionEvent.java | 6 +++--- .../events/AT_PersonImminentAdditionEvent.java | 6 +++--- .../events/AT_PersonImminentRemovalEvent.java | 6 +++--- .../people/events/AT_PersonRemovalEvent.java | 6 +++--- .../support/AT_PersonConstructionData.java | 2 +- .../plugins/people/support/AT_PersonError.java | 2 +- .../gcm/plugins/people/support/AT_PersonId.java | 6 +++--- .../plugins/people/support/AT_PersonRange.java | 8 ++++---- .../testsupport/AT_PeopleTestPluginFactory.java | 6 +++--- .../AT_PersonPropertiesPlugin.java | 2 +- .../AT_PersonPropertiesPluginId.java | 2 +- .../AT_PersonPropertyDataManager.java | 14 +++++++------- .../AT_PersonPropertyPluginData.java | 10 +++++----- .../events/AT_PersonPropertyDefinitionEvent.java | 6 +++--- .../events/AT_PersonPropertyUpdateEvent.java | 4 ++-- .../AT_PersonPropertyInteractionReport.java | 8 ++++---- ...ersonPropertyInteractionReportPluginData.java | 6 +++--- .../reports/AT_PersonPropertyReport.java | 6 +++--- .../AT_PersonPropertyReportPluginData.java | 6 +++--- ...T_PersonPropertyDefinitionInitialization.java | 6 +++--- .../support/AT_PersonPropertyDimension.java | 6 +++--- .../support/AT_PersonPropertyError.java | 2 +- .../support/AT_PersonPropertyFilter.java | 8 ++++---- .../support/AT_PersonPropertyInitialization.java | 4 ++-- .../support/AT_PersonPropertyLabeler.java | 6 +++--- .../AT_PersonPropertiesTestPluginFactory.java | 8 ++++---- .../AT_TestAuxiliaryPersonPropertyId.java | 6 +++--- .../testsupport/AT_TestPersonPropertyId.java | 6 +++--- .../AT_TestPersonPropertyLabeler.java | 4 ++-- .../plugins/properties/AT_PropertiesPlugin.java | 2 +- .../properties/AT_PropertiesPluginId.java | 2 +- .../support/AT_BooleanPropertyManager.java | 8 ++++---- .../support/AT_DoublePropertyManager.java | 8 ++++---- .../support/AT_EnumPropertyManager.java | 8 ++++---- .../support/AT_FloatPropertyManager.java | 8 ++++---- .../support/AT_IntPropertyManager.java | 8 ++++---- .../support/AT_ObjectPropertyManager.java | 8 ++++---- .../support/AT_PropertyDefinition.java | 6 +++--- .../properties/support/AT_PropertyError.java | 2 +- .../arraycontainers/AT_BooleanContainer.java | 6 +++--- .../arraycontainers/AT_DoubleValueContainer.java | 4 ++-- .../arraycontainers/AT_EnumContainer.java | 6 +++--- .../arraycontainers/AT_FloatValueContainer.java | 4 ++-- .../arraycontainers/AT_IntValueContainer.java | 4 ++-- .../arraycontainers/AT_ObjectValueContainer.java | 6 +++--- .../ms/gcm/plugins/regions/AT_RegionPlugin.java | 2 +- .../gcm/plugins/regions/AT_RegionPluginId.java | 2 +- .../datamanagers/AT_RegionsDataManager.java | 14 +++++++------- .../datamanagers/AT_RegionsPluginData.java | 8 ++++---- .../events/AT_PersonRegionUpdateEvent.java | 4 ++-- .../regions/events/AT_RegionAdditionEvent.java | 6 +++--- .../events/AT_RegionPropertyDefinitionEvent.java | 6 +++--- .../events/AT_RegionPropertyUpdateEvent.java | 4 ++-- .../regions/reports/AT_RegionPropertyReport.java | 6 +++--- .../AT_RegionPropertyReportPluginData.java | 6 +++--- .../regions/reports/AT_RegionTransferReport.java | 8 ++++---- .../AT_RegionTransferReportPluginData.java | 6 +++--- .../support/AT_RegionConstructionData.java | 6 +++--- .../plugins/regions/support/AT_RegionError.java | 2 +- .../plugins/regions/support/AT_RegionFilter.java | 8 ++++---- .../regions/support/AT_RegionLabeler.java | 6 +++--- ...T_RegionPropertyDefinitionInitialization.java | 6 +++--- .../support/AT_RegionPropertyDimension.java | 6 +++--- .../regions/support/AT_SimpleRegionId.java | 4 ++-- .../support/AT_SimpleRegionPropertyId.java | 4 ++-- .../testsupport/AT_RegionsTestPluginFactory.java | 8 ++++---- .../regions/testsupport/AT_TestRegionId.java | 6 +++--- .../testsupport/AT_TestRegionPropertyId.java | 6 +++--- .../ms/gcm/plugins/reports/AT_ReportPlugin.java | 2 +- .../gcm/plugins/reports/AT_ReportsPluginId.java | 2 +- .../reports/support/AT_ExperimentLineWriter.java | 6 +++--- .../plugins/reports/support/AT_LineWriter.java | 6 +++--- .../reports/support/AT_NIOReportItemHandler.java | 6 +++--- .../reports/support/AT_PeriodicReport.java | 10 +++++----- .../support/AT_PeriodicReportPluginData.java | 2 +- .../plugins/reports/support/AT_ReportError.java | 2 +- .../plugins/reports/support/AT_ReportHeader.java | 6 +++--- .../plugins/reports/support/AT_ReportItem.java | 6 +++--- .../reports/support/AT_SimpleReportLabel.java | 10 +++++----- .../plugins/resources/AT_ResourcesPlugin.java | 2 +- .../plugins/resources/AT_ResourcesPluginId.java | 2 +- .../datamanagers/AT_ResourcesDataManager.java | 16 ++++++++-------- .../datamanagers/AT_ResourcesPluginData.java | 8 ++++---- .../events/AT_PersonResourceUpdateEvent.java | 4 ++-- .../events/AT_RegionResourceUpdateEvent.java | 4 ++-- .../events/AT_ResourceIdAdditionEvent.java | 6 +++--- .../AT_ResourcePropertyDefinitionEvent.java | 6 +++--- .../events/AT_ResourcePropertyUpdateEvent.java | 4 ++-- .../reports/AT_PersonResourceReport.java | 6 +++--- .../AT_PersonResourceReportPluginData.java | 6 +++--- .../reports/AT_ResourcePropertyReport.java | 4 ++-- .../AT_ResourcePropertyReportPluginData.java | 6 +++--- .../resources/reports/AT_ResourceReport.java | 6 +++--- .../reports/AT_ResourceReportPluginData.java | 6 +++--- .../resources/support/AT_ResourceError.java | 2 +- .../resources/support/AT_ResourceFilter.java | 8 ++++---- .../support/AT_ResourceInitialization.java | 6 +++--- .../resources/support/AT_ResourceLabeler.java | 6 +++--- .../AT_ResourcePropertyInitialization.java | 4 ++-- .../AT_ResourcesTestPluginFactory.java | 8 ++++---- .../resources/testsupport/AT_TestResourceId.java | 6 +++--- .../testsupport/AT_TestResourcePropertyId.java | 6 +++--- .../stochastics/AT_StochasticsDataManager.java | 8 ++++---- .../stochastics/AT_StochasticsPlugin.java | 2 +- .../stochastics/AT_StochasticsPluginData.java | 6 +++--- .../stochastics/AT_StochasticsPluginId.java | 2 +- .../AT_SimpleRandomNumberGeneratorId.java | 6 +++--- .../stochastics/support/AT_StochasticsError.java | 2 +- .../gcm/plugins/stochastics/support/AT_Well.java | 6 +++--- .../stochastics/support/AT_WellState.java | 8 ++++---- .../AT_StochasticsTestPluginFactory.java | 8 ++++---- .../testsupport/AT_TestRandomGeneratorId.java | 2 +- .../aspr/ms/gcm/tools/MetaInfoReportRunner.java | 2 +- .../ms/gcm/tools/MissingTestsReportRunner.java | 2 +- .../aspr/ms/gcm/tools/codestats/CodeCounts.java | 2 +- .../PluginDependencyInfoGenerator.java | 14 +++++++------- 483 files changed, 1035 insertions(+), 1036 deletions(-) diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ActorContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ActorContext.java index 247d01207..7ffad4aca 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ActorContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ActorContext.java @@ -7,7 +7,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An actor context provides access to the nucleus engine and published data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManager.java index 349520ed8..569817a3c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManager.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.nucleus; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Base class for all data managers. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManagerContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManagerContext.java index 728460028..df5567899 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManagerContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DataManagerContext.java @@ -7,7 +7,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A data manager context provides access to the nucleus engine and other data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DimensionContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DimensionContext.java index d96872224..e783d5c3b 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DimensionContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/DimensionContext.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A context containing PluginData and PluginDataBuilder instances that are used diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/EventFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/EventFilter.java index 0f430f176..853d1405d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/EventFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/EventFilter.java @@ -6,8 +6,8 @@ import org.apache.commons.math3.util.Pair; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A generics-based data class for collecting an ordered list of predicates of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Experiment.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Experiment.java index 6c5801d0e..117509dc7 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Experiment.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Experiment.java @@ -13,8 +13,8 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An experiment provides a means for executing the simulation over variants of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentContext.java index a737edf3f..b820b8131 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentContext.java @@ -6,8 +6,8 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.util.TriConsumer; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * Interface for the thread safe access of experiment/scenario state and meta diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentParameterData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentParameterData.java index 61785e18f..10e5af37f 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentParameterData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentParameterData.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An experiment provides a means for executing the simulation over variants of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentStateManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentStateManager.java index 8ec06761f..8826a9d7b 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentStateManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ExperimentStateManager.java @@ -21,10 +21,10 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.util.TriConsumer; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.time.TimeElapser; import net.jcip.annotations.NotThreadSafe; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; -import util.time.TimeElapser; /** * A utility class used by the experiment to manage experiment context consumers diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunction.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunction.java index 72d47f152..bac858e44 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunction.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunction.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class IdentifiableFunction { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunctionMap.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunctionMap.java index 334adc4d9..66d01f181 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunctionMap.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/IdentifiableFunctionMap.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.function.Function; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public final class IdentifiableFunctionMap { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/NucleusError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/NucleusError.java index 3751906c5..db2df8eb6 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/NucleusError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/NucleusError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.nucleus; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PlanQueueData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PlanQueueData.java index 40582729f..4a511a86c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PlanQueueData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PlanQueueData.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.nucleus; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Class supporting serialization of plans diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Plugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Plugin.java index f29b15768..6588a85c5 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Plugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Plugin.java @@ -7,8 +7,8 @@ import java.util.Set; import java.util.function.Consumer; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A plugin is the main compositional element of an experiment. Plugins contain diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginContext.java index a74549e13..1451ca82d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginContext.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.function.Consumer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A plugin context provides plugin's the ability to add actors and data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContainer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContainer.java index e78a4dd4a..b12ff911e 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContainer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContainer.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.nucleus; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A container for PluginDataBuilder instances. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContext.java index d55f1e2ef..7fc2d66a8 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/PluginDataBuilderContext.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An implementor of PluginDataBuilderContainer. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ReportContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ReportContext.java index 83a076ca7..bddd534f6 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ReportContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/ReportContext.java @@ -7,7 +7,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An report context provides access to the nucleus simulation. It is supplied diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimplePluginId.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimplePluginId.java index 9b7e61b60..2ebd9ac19 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimplePluginId.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimplePluginId.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.nucleus; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A convenience class for representing PluginId as a wrapped object. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Simulation.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Simulation.java index 1157fd9c0..cd14739c0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Simulation.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/Simulation.java @@ -21,14 +21,14 @@ import org.apache.commons.math3.util.Pair; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.graph.Graph; +import gov.hhs.aspr.ms.util.graph.GraphDepthEvaluator; +import gov.hhs.aspr.ms.util.graph.Graphs; +import gov.hhs.aspr.ms.util.graph.MutableGraph; +import gov.hhs.aspr.ms.util.path.MapPathSolver; +import gov.hhs.aspr.ms.util.path.Path; import net.jcip.annotations.NotThreadSafe; -import util.errors.ContractException; -import util.graph.Graph; -import util.graph.GraphDepthEvaluator; -import util.graph.Graphs; -import util.graph.MutableGraph; -import util.path.MapPathSolver; -import util.path.Path; /** * An instance of the Simulation orchestrates the execution of a scenario from a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimulationState.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimulationState.java index 49c4db360..c1f103091 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimulationState.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/SimulationState.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable data class that holds 1) the base date aligned to simulation diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityError.java index 738f8f681..9c10a8a1b 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.nucleus.testsupport.runcontinuityplugin; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityPlugin.java index 9a83928de..4253d4f9e 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/RunContinuityPlugin.java @@ -1,8 +1,8 @@ package gov.hhs.aspr.ms.gcm.nucleus.testsupport.runcontinuityplugin; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A plugin providing a person property management to the simulation. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestActorPlan.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestActorPlan.java index 4214ec45b..fe07dd003 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestActorPlan.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestActorPlan.java @@ -3,7 +3,7 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.ActorContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Test Support class that describes an action for an actor as a scheduled plan diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestDataManagerPlan.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestDataManagerPlan.java index b57d5ffef..905e993e0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestDataManagerPlan.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestDataManagerPlan.java @@ -3,7 +3,7 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.DataManagerContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Test Support class that describes an action for a data manager as a scheduled diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestError.java index 41ca6d83e..fd933b0f5 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestOutputConsumer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestOutputConsumer.java index 3dbf2eda1..537804d36 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestOutputConsumer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestOutputConsumer.java @@ -7,8 +7,8 @@ import java.util.Optional; import java.util.function.Consumer; -import util.errors.ContractException; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; /** * A Testing utility class that will consume simulation output and includes a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPlugin.java index de1a18eb9..c32732ff2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPlugin.java @@ -7,7 +7,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.PluginContext; import gov.hhs.aspr.ms.gcm.nucleus.PluginId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Static test support plugin that is designed to work with a unit testing diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginData.java index 96d320ba8..b6daf83e1 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginData.java @@ -12,8 +12,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginData; import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.nucleus.PluginId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * Thread safe plugin data container for associating plans with actor and data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginFactory.java index 3eb1cef11..0cd5bc959 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestPluginFactory.java @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.NucleusError; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.PluginData; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A static test support class for the {@linkplain TestPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestReportPlan.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestReportPlan.java index 5f5d783be..51f09d839 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestReportPlan.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestReportPlan.java @@ -3,7 +3,7 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.ReportContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Test Support class that describes an action for an actor as a scheduled plan diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestSimulation.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestSimulation.java index 47b5cd6cb..2ddd50c78 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestSimulation.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/TestSimulation.java @@ -9,7 +9,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.Simulation; import gov.hhs.aspr.ms.gcm.nucleus.SimulationState; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A Testing utility class that will execute a simulation given a list of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/GlobalPropertiesPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/GlobalPropertiesPlugin.java index a46579613..0caaecad1 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/GlobalPropertiesPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/GlobalPropertiesPlugin.java @@ -9,8 +9,7 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.reports.GlobalPropertyReport; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.reports.GlobalPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertiesError; - -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A plugin providing a global property data manager to the simulation. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesDataManager.java index 5555b70c8..d295d0147 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesDataManager.java @@ -17,7 +17,7 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyInitialization; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A mutable data manager for global properties. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesPluginData.java index d99051930..1c2e34e83 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/GlobalPropertiesPluginData.java @@ -11,8 +11,8 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state of global components and global diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/GlobalPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/GlobalPropertyDefinitionEvent.java index caab51e65..19ad6c2c3 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/GlobalPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/GlobalPropertyDefinitionEvent.java @@ -3,7 +3,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An event released by the global data manager whenever a global property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReport.java index 651db5dad..a3d01493c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReport.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A Report that displays assigned global property values over time. Fields Time diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReportPluginData.java index 7d73c6aff..8343b5e80 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/GlobalPropertyReportPluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting GlobalPropertyReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertiesError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertiesError.java index 2395d3318..4bc9317d2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertiesError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertiesError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.globalproperties.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyDimension.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyDimension.java index 3a7fcfe58..ec40e8b9f 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyDimension.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyDimension.java @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DimensionContext; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Dimension implementation for setting a global property to a list of values in diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyInitialization.java index 79d6db224..f9fc6a77e 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/GlobalPropertyInitialization.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Immutable data class that represents the addition of a global property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/SimpleGlobalPropertyId.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/SimpleGlobalPropertyId.java index 6acf7c2cf..83b4ce13a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/SimpleGlobalPropertyId.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/SimpleGlobalPropertyId.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.globalproperties.support; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A simple implementor of {@link GlobalPropertyId} that wraps a value. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/GlobalPropertiesTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/GlobalPropertiesTestPluginFactory.java index c700eb3de..ef7be5af1 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/GlobalPropertiesTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/GlobalPropertiesTestPluginFactory.java @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.reports.GlobalPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertiesError; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain GlobalPropertiesPlugin}. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/GroupsPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/GroupsPlugin.java index 8e7d01635..1204522ad 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/GroupsPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/GroupsPlugin.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupError; import gov.hhs.aspr.ms.gcm.plugins.people.PeoplePluginId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPluginId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A plugin providing a group data manager to the simulation. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsDataManager.java index 9a969a6ce..032916e82 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsDataManager.java @@ -59,8 +59,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.GuardedBy; -import util.errors.ContractException; /** *

diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsPluginData.java index 7b1f4deab..2d79e664e 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/GroupsPluginData.java @@ -23,9 +23,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; import net.jcip.annotations.Immutable; -import util.errors.ContractException; -import util.wrappers.MultiKey; /** * An immutable container of the initial state of the GroupDataManager. It diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/GroupPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/GroupPropertyDefinitionEvent.java index db0367428..65eb308c5 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/GroupPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/GroupPropertyDefinitionEvent.java @@ -5,8 +5,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event released by the groups data manager whenever a group property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPopulationReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPopulationReportPluginData.java index 1432a6656..919e62059 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPopulationReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPopulationReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting GroupPopulationReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPropertyReportPluginData.java index 27b87262a..b45efa9ff 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/GroupPropertyReportPluginData.java @@ -13,8 +13,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting GroupPropertyReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupConstructionInfo.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupConstructionInfo.java index 327fe008f..425194de2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupConstructionInfo.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupConstructionInfo.java @@ -5,9 +5,9 @@ import java.util.Map; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; import net.jcip.annotations.NotThreadSafe; -import util.errors.ContractException; /** * Represents the information to add a group, but not its relationship to diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupError.java index 8c9fea88b..8f51d5cc4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.groups.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupId.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupId.java index d897cda9e..dd563dc14 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupId.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupId.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.groups.support; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Identifier for all groups diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupLabeler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupLabeler.java index 517684681..3b205a60f 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupLabeler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupLabeler.java @@ -13,7 +13,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A labeler for groups. The dimension of the labeler is diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupMemberFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupMemberFilter.java index 8422c280c..1d0f786d4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupMemberFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupMemberFilter.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class GroupMemberFilter extends Filter { final GroupId groupId; diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDefinitionInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDefinitionInitialization.java index 5806c9b6a..0a942344b 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDefinitionInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDefinitionInitialization.java @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A class for defining a group property with an associated property id and diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDimension.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDimension.java index d8214fc08..ff49c1d93 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDimension.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyDimension.java @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DimensionContext; import gov.hhs.aspr.ms.gcm.plugins.groups.datamanagers.GroupsPluginData; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Dimension implementation for setting a group property to a list of values in diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyValue.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyValue.java index 634487aee..6f8b3df7c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyValue.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupPropertyValue.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.groups.support; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public record GroupPropertyValue(GroupPropertyId groupPropertyId, Object value) { /** diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypeCountMap.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypeCountMap.java index 2f907449f..8ca56393a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypeCountMap.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypeCountMap.java @@ -6,9 +6,9 @@ import java.util.Set; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.Partition; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; import net.jcip.annotations.NotThreadSafe; -import util.errors.ContractException; /** * Represents the mapping from the various {@link GroupTypeId} values to the diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypesForPersonFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypesForPersonFilter.java index e2ddd8527..e47fcc632 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypesForPersonFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupTypesForPersonFilter.java @@ -14,7 +14,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class GroupTypesForPersonFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsContext.java index 855004d57..bd7b93a68 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsContext.java @@ -2,7 +2,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DataManager; import gov.hhs.aspr.ms.gcm.nucleus.NucleusError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A limited context that grants access to the simulation via the groups data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonAndGroupTypeFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonAndGroupTypeFilter.java index 6fd35dfe0..cca606d62 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonAndGroupTypeFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonAndGroupTypeFilter.java @@ -13,7 +13,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class GroupsForPersonAndGroupTypeFilter extends Filter { private final GroupTypeId groupTypeId; diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonFilter.java index 82ac9241f..10a193f13 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/GroupsForPersonFilter.java @@ -14,7 +14,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class GroupsForPersonFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/GroupsTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/GroupsTestPluginFactory.java index 575793397..d433209e5 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/GroupsTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/GroupsTestPluginFactory.java @@ -33,9 +33,9 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; /** * A static test support class for the {@linkplain GroupsPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/MaterialsPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/MaterialsPlugin.java index 383359f92..e4cc09c63 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/MaterialsPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/MaterialsPlugin.java @@ -16,7 +16,7 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.regions.RegionsPluginId; import gov.hhs.aspr.ms.gcm.plugins.resources.ResourcesPluginId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A plugin providing a materials data manager to the simulation. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsDataManager.java index e4aa370e3..023b999ae 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsDataManager.java @@ -55,8 +55,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.events.ResourceIdAdditionEvent; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.errors.ContractException; -import util.wrappers.MutableLong; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableLong; /** * General manager for all material activities. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsPluginData.java index 6c9e768ec..151bf3cf9 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamangers/MaterialsPluginData.java @@ -23,8 +23,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state materials producers. It contains: diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyDefinitionEvent.java index ca273c640..61346cf15 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyDefinitionEvent.java @@ -5,8 +5,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event indicating the addition of a batch property for the given material. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyUpdateEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyUpdateEvent.java index b0f9c6f57..8c20a1477 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyUpdateEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/BatchPropertyUpdateEvent.java @@ -5,8 +5,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchPropertyId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public record BatchPropertyUpdateEvent(BatchId batchId, BatchPropertyId batchPropertyId, Object previousPropertyValue, diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialIdAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialIdAdditionEvent.java index ce60cfa40..dc253be98 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialIdAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialIdAdditionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event indicating that a material type has been added diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerAdditionEvent.java index 11fc62f43..4e75cbbb4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerAdditionEvent.java @@ -7,8 +7,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.regions.events.RegionAdditionEvent; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event indicating that a materials producer has been added diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerPropertyDefinitionEvent.java index 32304c5c7..074649605 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/MaterialsProducerPropertyDefinitionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event released by the materials data manager whenever a materials producer diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/BatchStatusReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/BatchStatusReportPluginData.java index f0a6ee5ad..045520e50 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/BatchStatusReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/BatchStatusReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting BatchStatusReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerPropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerPropertyReportPluginData.java index 0f3a2f8fa..8d4f35fc3 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerPropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerPropertyReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting MaterialsProducerProperty construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerResourceReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerResourceReportPluginData.java index a4584c5f5..6d4a7bf01 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerResourceReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/MaterialsProducerResourceReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting BatchStatusReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/StageReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/StageReportPluginData.java index aef57a926..f4f064170 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/StageReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/StageReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting StageReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchConstructionInfo.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchConstructionInfo.java index 29b68d390..438c76080 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchConstructionInfo.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchConstructionInfo.java @@ -5,8 +5,8 @@ import java.util.Map; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Represents the information to fully specify a batch, but not its relationship diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchPropertyDefinitionInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchPropertyDefinitionInitialization.java index 7a7b13b71..92f6eb9a0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchPropertyDefinitionInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/BatchPropertyDefinitionInitialization.java @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A class for defining a batch property with an associated property id and diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsError.java index 17f9ffda9..c1000bf73 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.materials.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerConstructionData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerConstructionData.java index 69cfeed2d..ac4760888 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerConstructionData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerConstructionData.java @@ -9,7 +9,7 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class MaterialsProducerConstructionData { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerPropertyDefinitionInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerPropertyDefinitionInitialization.java index 113e28b44..39a2c7417 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerPropertyDefinitionInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/MaterialsProducerPropertyDefinitionInitialization.java @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A class for defining a material producer property with an associated property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/StageConversionInfo.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/StageConversionInfo.java index bb0e6bf4f..358e195a9 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/StageConversionInfo.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/StageConversionInfo.java @@ -5,8 +5,8 @@ import java.util.Map; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Represents the information to fully specify the conversion of a stage into a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/MaterialsTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/MaterialsTestPluginFactory.java index bdda20ee2..f12e3f9c0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/MaterialsTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/MaterialsTestPluginFactory.java @@ -44,8 +44,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain MaterialsPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/PartitionsPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/PartitionsPlugin.java index f2b726c92..723b9f59d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/PartitionsPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/PartitionsPlugin.java @@ -11,7 +11,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.people.PeoplePluginId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPluginId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A nucleus plugin for the management of population partitions. A population diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/PartitionsDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/PartitionsDataManager.java index 8968e68ac..3fac801cc 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/PartitionsDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/PartitionsDataManager.java @@ -32,7 +32,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Mutable data manager for managing population partitions that are maintained diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/DegeneratePopulationPartitionImpl.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/DegeneratePopulationPartitionImpl.java index b3cba8673..dbc3115da 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/DegeneratePopulationPartitionImpl.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/DegeneratePopulationPartitionImpl.java @@ -17,7 +17,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementation of PopulationPartition for degenerate partitions having only a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/LabelSet.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/LabelSet.java index e7b71b5f2..1ba47cbdd 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/LabelSet.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/LabelSet.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.Set; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A {@linkplain LabelSet} is a set of labels that are used to specify a sub-set diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionError.java index 16fee993d..569cbb191 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.partitions.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionsContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionsContext.java index 2f6940953..86153584a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionsContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PartitionsContext.java @@ -2,7 +2,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DataManager; import gov.hhs.aspr.ms.gcm.nucleus.NucleusError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A limited context that grants access to the simulation via the partition data diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PopulationPartitionImpl.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PopulationPartitionImpl.java index bbd16cef9..2011aa227 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PopulationPartitionImpl.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/PopulationPartitionImpl.java @@ -24,8 +24,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; -import util.combinatorics.TupleGenerator; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.combinatorics.TupleGenerator; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Primary implementor for {@link PopulationPartition} diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/TreeBitSetPeopleContainer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/TreeBitSetPeopleContainer.java index b02299340..b36f8e6f4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/TreeBitSetPeopleContainer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/TreeBitSetPeopleContainer.java @@ -10,7 +10,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * PeopleContainer implementor that uses a BitSet to record a boolean value of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AndFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AndFilter.java index 7ce051d55..5d8879601 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AndFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AndFilter.java @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public final class AndFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/Filter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/Filter.java index 75f536429..d0006e970 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/Filter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/Filter.java @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public abstract class Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/NotFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/NotFilter.java index d90e8334f..653ba4d56 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/NotFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/NotFilter.java @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public final class NotFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/OrFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/OrFilter.java index f9e12c87c..5b8893c11 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/OrFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/OrFilter.java @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public final class OrFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/PartitionsTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/PartitionsTestPluginFactory.java index 2a9e60e02..911138baa 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/PartitionsTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/PartitionsTestPluginFactory.java @@ -28,7 +28,7 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A static test support class for the {@linkplain PartitionsPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/TestPartitionsContext.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/TestPartitionsContext.java index 638a0ef99..cf2dce73c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/TestPartitionsContext.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/TestPartitionsContext.java @@ -4,7 +4,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DataManager; import gov.hhs.aspr.ms.gcm.nucleus.NucleusError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Test support implementor of PartitionsContext that uses an ActorContext diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesDataManager.java index 998855c2f..816138b90 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesDataManager.java @@ -21,7 +21,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.events.PersonRemovalEvent; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Published data view that provides attribute information. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPlugin.java index 49b3adc20..5b69dfb12 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPlugin.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.AttributeError; import gov.hhs.aspr.ms.gcm.plugins.people.PeoplePluginId; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** *

diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPluginData.java index 4d61e2dde..1be56941a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AttributesPluginData.java @@ -15,8 +15,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.AttributeId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public class AttributesPluginData implements PluginData { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeDefinition.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeDefinition.java index 0c2fb25c3..80377a321 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeDefinition.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeDefinition.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A thread-safe, immutable class that defines an attribute, but does not diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeError.java index c56db0a04..5d492a9d2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeFilter.java index febd93459..b23a2c19b 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeFilter.java @@ -13,7 +13,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.AttributesDataManager; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.events.AttributeUpdateEvent; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AttributeFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeLabeler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeLabeler.java index f7f121e66..76db35b3a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeLabeler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AttributeLabeler.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.events.AttributeUpdateEvent; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A labeler for attributes. The dimension of the labeler is the given diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeopleDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeopleDataManager.java index fbf5024ba..ca65de470 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeopleDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeopleDataManager.java @@ -19,7 +19,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonRange; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Mutable data manager for people. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeoplePluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeoplePluginData.java index 0ac39dee0..830c2a6c1 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeoplePluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/PeoplePluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonRange; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state of people containing person ids. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonAdditionEvent.java index b9c7a7c60..35fb767e9 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonAdditionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event to notify the plugins that a person has been fully added to the diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentAdditionEvent.java index 65beca9df..64261ea71 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentAdditionEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event for notifying plugins that a person is being added to the diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentRemovalEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentRemovalEvent.java index 62d8111e9..e28aff16f 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentRemovalEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonImminentRemovalEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Indicates that the given person will be removed from the simulation diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonRemovalEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonRemovalEvent.java index 08b281f17..98028700d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonRemovalEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/events/PersonRemovalEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Indicates that the given person has been removed from the simulation. All diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonConstructionData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonConstructionData.java index f30cce495..1bd95bdce 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonConstructionData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonConstructionData.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Optional; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Container for values used to in the construction of an agent. Values are diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonError.java index 935a86cdb..dd3c279aa 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.people.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonId.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonId.java index 0e71f3308..4b9f06bd7 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonId.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonId.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.people.support; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Identifier for all people diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonRange.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonRange.java index fdb336757..177b193d6 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonRange.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/support/PersonRange.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.people.support; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Represents a range of person id values diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/PeopleTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/PeopleTestPluginFactory.java index cc54d1155..c57e41920 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/PeopleTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/PeopleTestPluginFactory.java @@ -19,7 +19,7 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A static test support class for the {@linkplain PeoplePlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/PersonPropertiesPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/PersonPropertiesPlugin.java index 456e35df5..545cabf6d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/PersonPropertiesPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/PersonPropertiesPlugin.java @@ -12,8 +12,8 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.reports.PersonPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyError; import gov.hhs.aspr.ms.gcm.plugins.regions.RegionsPluginId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A plugin providing a person property management to the simulation. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesDataManager.java index 7b6795594..f0d19ce9c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesDataManager.java @@ -43,7 +43,7 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsDataManager; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Mutable data manager for person properties diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesPluginData.java index 9dd270a74..e9c6453e7 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/PersonPropertiesPluginData.java @@ -16,8 +16,8 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state of person properties. Contains: diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/PersonPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/PersonPropertyDefinitionEvent.java index 03ee94827..ac31d2acc 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/PersonPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/PersonPropertyDefinitionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event released by the people data manager whenever a person property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/PersonPropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/PersonPropertyReportPluginData.java index 5f03f7ea9..0108882f4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/PersonPropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/PersonPropertyReportPluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting PersonPropertyReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDefinitionInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDefinitionInitialization.java index c1fe0848f..56fcf1154 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDefinitionInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDefinitionInitialization.java @@ -10,8 +10,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A class for defining a person property with an associated property id and diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDimension.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDimension.java index f98846811..b0cb47bd2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDimension.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyDimension.java @@ -9,7 +9,7 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.datamanagers.PersonPropertiesPluginData; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Dimension implementation for setting a person property to a list of values in diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyError.java index f530cccd1..e5a53daa8 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.personproperties.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyFilter.java index 4470c5e4c..eff7248d2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyFilter.java @@ -15,7 +15,7 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.events.PersonPropertyUpdateEvent; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class PersonPropertyFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyLabeler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyLabeler.java index 69b0efce8..290291085 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyLabeler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/PersonPropertyLabeler.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.personproperties.datamanagers.PersonPropertiesDataManager; import gov.hhs.aspr.ms.gcm.plugins.personproperties.events.PersonPropertyUpdateEvent; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A labeler for person properties. The dimension of the labeler is the given diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/PersonPropertiesTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/PersonPropertiesTestPluginFactory.java index 6163ddca4..1bdd3bc85 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/PersonPropertiesTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/PersonPropertiesTestPluginFactory.java @@ -32,8 +32,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain PersonPropertiesPlugin}. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/BooleanPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/BooleanPropertyManager.java index acbb1edde..964167370 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/BooleanPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/BooleanPropertyManager.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.BooleanContainer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that compresses Boolean property values diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/DoublePropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/DoublePropertyManager.java index e40ac957d..fbea8965d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/DoublePropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/DoublePropertyManager.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.DoubleValueContainer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that compresses Double property values diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/EnumPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/EnumPropertyManager.java index 944e1c7c6..bdbcc5ddf 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/EnumPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/EnumPropertyManager.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.EnumContainer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that compresses Enum property values diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/FloatPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/FloatPropertyManager.java index 9d3d1fd35..0998819d6 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/FloatPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/FloatPropertyManager.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.FloatValueContainer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that compresses Float property values diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IndexedPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IndexedPropertyManager.java index 8e2d8041e..a59137ba2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IndexedPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IndexedPropertyManager.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.plugins.properties.support; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Common interface to all property managers. A property manager manages diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IntPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IntPropertyManager.java index b9be1b034..690b2a7f1 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IntPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/IntPropertyManager.java @@ -5,7 +5,7 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.IntValueContainer; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.IntValueContainer.IntValueType; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that compresses Byte, Short, Integer or diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/ObjectPropertyManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/ObjectPropertyManager.java index 619b0b7be..49963ba3a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/ObjectPropertyManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/ObjectPropertyManager.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.ObjectValueContainer; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Implementor of IndexedPropertyManager that stores Object property values in diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyDefinition.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyDefinition.java index 68d790546..5d9d924cd 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyDefinition.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyDefinition.java @@ -2,8 +2,8 @@ import java.util.Optional; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A thread-safe, immutable class that defines a property, but does not indicate diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyError.java index 4b116a84d..7fee632ab 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/PropertyError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.properties.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/DoubleValueContainer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/DoubleValueContainer.java index ceef34642..d3973c6e2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/DoubleValueContainer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/DoubleValueContainer.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A container that maps non-negative int index values to doubles by storing diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/FloatValueContainer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/FloatValueContainer.java index 143b3d740..dde8c9225 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/FloatValueContainer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/FloatValueContainer.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A container that maps non-negative int index values to floats by storing each diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/IntValueContainer.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/IntValueContainer.java index 26c17e90e..12e7a3330 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/IntValueContainer.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/IntValueContainer.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A container that maps non-negative int index values to bytes, shorts, ints or diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/RegionsPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/RegionsPlugin.java index fb13cde38..a38abf3b4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/RegionsPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/RegionsPlugin.java @@ -11,7 +11,7 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.reports.RegionTransferReport; import gov.hhs.aspr.ms.gcm.plugins.regions.reports.RegionTransferReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class RegionsPlugin { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsDataManager.java index 823162bc6..4d1e3b1d4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsDataManager.java @@ -35,8 +35,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyDefinitionInitialization; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; -import util.errors.ContractException; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; /** * Mutable data manager for regions. This data manager is for internal use by diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsPluginData.java index cd32a81a8..a0fbc2366 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/RegionsPluginData.java @@ -21,8 +21,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state of regions. It contains:
diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionAdditionEvent.java index c7b543052..c809abd59 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionAdditionEvent.java @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An event indicating that a region has been added diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionPropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionPropertyDefinitionEvent.java index 251076822..7e2032e0d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionPropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/RegionPropertyDefinitionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * Event indicating the addition of a region property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReport.java index 05259e8fd..8b2dbae38 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReport.java @@ -15,7 +15,7 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A Report that displays assigned region property values over time. Fields Time diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReportPluginData.java index 971ac3d1f..a1c7e8599 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionPropertyReportPluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting RegionPropertyReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReport.java index 1d2858185..5d9563a37 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReport.java @@ -13,8 +13,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.PeriodicReport; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportHeader; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportItem; -import util.wrappers.MultiKey; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; /** * A periodic Report that displays the number of times a person transferred from diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReportPluginData.java index f87eb1bba..f7480f1bb 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/RegionTransferReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting PersonPropertyReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionConstructionData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionConstructionData.java index dfb766ad2..f63bc9124 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionConstructionData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionConstructionData.java @@ -7,7 +7,7 @@ import java.util.Map; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class RegionConstructionData { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionError.java index ce666e828..fca2641f4 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.regions.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionFilter.java index 74719fff5..ac17906d2 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionFilter.java @@ -11,7 +11,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsDataManager; import gov.hhs.aspr.ms.gcm.plugins.regions.events.PersonRegionUpdateEvent; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class RegionFilter extends Filter { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionLabeler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionLabeler.java index 1c2528f90..7ce48fc45 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionLabeler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionLabeler.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsDataManager; import gov.hhs.aspr.ms.gcm.plugins.regions.events.PersonRegionUpdateEvent; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A labeler for regions. The dimension of the labeler is the diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDefinitionInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDefinitionInitialization.java index 8e9802c0e..44e3e010c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDefinitionInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDefinitionInitialization.java @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A class for defining a person property with an associated property id and diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDimension.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDimension.java index ba36cf3a0..db706e72a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDimension.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/RegionPropertyDimension.java @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.DimensionContext; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsPluginData; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class RegionPropertyDimension implements Dimension { private final Data data; diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/RegionsTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/RegionsTestPluginFactory.java index 6170fc038..b3222017c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/RegionsTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/RegionsTestPluginFactory.java @@ -29,8 +29,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain RegionsPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/NIOReportItemHandler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/NIOReportItemHandler.java index 2decd4621..247d26c69 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/NIOReportItemHandler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/NIOReportItemHandler.java @@ -8,7 +8,7 @@ import java.util.function.Consumer; import gov.hhs.aspr.ms.gcm.nucleus.ExperimentContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An experiment-level output management utility for writing report items to diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReport.java index 90d0c96f9..7fca2e821 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReport.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.reports.support; import gov.hhs.aspr.ms.gcm.nucleus.ReportContext; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * The abstract base class for reports that aggregate reporting aligned to a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReportPluginData.java index 789fe25a9..bcfa10efe 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/PeriodicReportPluginData.java @@ -2,7 +2,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginData; import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public abstract class PeriodicReportPluginData implements PluginData { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportError.java index 97bd9b2cd..274800e8a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.reports.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportHeader.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportHeader.java index 8c9436da4..99021b806 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportHeader.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportHeader.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; import net.jcip.annotations.NotThreadSafe; -import util.errors.ContractException; /** * An immutable, ordered container for the string values in the header of a diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportItem.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportItem.java index a7acdba5a..c91b75784 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportItem.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/ReportItem.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.NotThreadSafe; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A thread safe(immutable), container that supports output lines for multiple diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/SimpleReportLabel.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/SimpleReportLabel.java index bb3e6bcfb..d646f0875 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/SimpleReportLabel.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/SimpleReportLabel.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.reports.support; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * A convenience implementor of ReportLabel that wraps a value. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/ResourcesPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/ResourcesPlugin.java index 4ed5fb7e2..36885fb15 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/ResourcesPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/ResourcesPlugin.java @@ -14,7 +14,7 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.reports.ResourceReport; import gov.hhs.aspr.ms.gcm.plugins.resources.reports.ResourceReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class ResourcesPlugin { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesDataManager.java index 67de5ef79..fc0d0f530 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesDataManager.java @@ -40,8 +40,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceInitialization; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyInitialization; -import util.errors.ContractException; -import util.wrappers.MutableLong; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableLong; /** * Data manager for resources. Resource property values are generally mutable diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesPluginData.java index 706b68379..3123e88c0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/ResourcesPluginData.java @@ -20,8 +20,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An immutable container of the initial state of resources. It contains:
diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourceIdAdditionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourceIdAdditionEvent.java index 787938788..82ce91004 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourceIdAdditionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourceIdAdditionEvent.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; /** * An observation event indicating that a resource id has been added. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourcePropertyDefinitionEvent.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourcePropertyDefinitionEvent.java index ad7667253..b42ad11f7 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourcePropertyDefinitionEvent.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/ResourcePropertyDefinitionEvent.java @@ -5,8 +5,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.Immutable; -import util.errors.ContractException; @Immutable public record ResourcePropertyDefinitionEvent(ResourceId resourceId, ResourcePropertyId resourcePropertyId, diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReport.java index c88a4e2fe..5bbd91bcd 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReport.java @@ -22,8 +22,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.events.ResourceIdAdditionEvent; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.errors.ContractException; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; /** * A periodic Report that displays number of people who have/do not have any diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReportPluginData.java index 0538fbee6..6f4a544f8 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/PersonResourceReportPluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting PersonResourceReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourcePropertyReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourcePropertyReportPluginData.java index afabb88d3..dc884d53d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourcePropertyReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourcePropertyReportPluginData.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginDataBuilder; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting PersonResourceReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReport.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReport.java index a6b5cc851..48dcd2e7c 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReport.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReport.java @@ -23,7 +23,7 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.events.ResourceIdAdditionEvent; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A periodic Report that displays the creation, transfer or consumption of diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReportPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReportPluginData.java index 2590fa1cf..f87dbe06d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReportPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/ResourceReportPluginData.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A PluginData class supporting PersonResourceReport construction. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceError.java index 93ddbd358..e18cbe53d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.resources.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceFilter.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceFilter.java index 9db468d04..6f9679506 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceFilter.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceFilter.java @@ -13,7 +13,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.resources.datamanagers.ResourcesDataManager; import gov.hhs.aspr.ms.gcm.plugins.resources.events.PersonResourceUpdateEvent; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class ResourceFilter extends Filter { private final ResourceId resourceId; diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceLabeler.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceLabeler.java index be529905a..571527100 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceLabeler.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourceLabeler.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.resources.datamanagers.ResourcesDataManager; import gov.hhs.aspr.ms.gcm.plugins.resources.events.PersonResourceUpdateEvent; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A a labeler for resources. The dimension of the labeler is the given diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourcePropertyInitialization.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourcePropertyInitialization.java index c05947c69..dc390229a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourcePropertyInitialization.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/ResourcePropertyInitialization.java @@ -4,7 +4,7 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * Immutable data class that represents the addition of a resource property diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/ResourcesTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/ResourcesTestPluginFactory.java index 115d19c71..8a68d892a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/ResourcesTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/ResourcesTestPluginFactory.java @@ -35,8 +35,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain ResourcesPlugin}. Provides diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/StochasticsPlugin.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/StochasticsPlugin.java index 4e1287058..2813efc73 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/StochasticsPlugin.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/StochasticsPlugin.java @@ -3,8 +3,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; +import gov.hhs.aspr.ms.util.errors.ContractError; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractError; /** *

diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsDataManager.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsDataManager.java index 0275a70cc..1b5107ac0 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsDataManager.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsDataManager.java @@ -13,7 +13,7 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.Well; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * A mutable data manager for random number generators. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsPluginData.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsPluginData.java index cd7b2d2dc..dba873d69 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsPluginData.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/datamanagers/StochasticsPluginData.java @@ -10,8 +10,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; /** * A thread-safe container for the initial state of random generators. diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/SimpleRandomNumberGeneratorId.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/SimpleRandomNumberGeneratorId.java index bb54c777b..4b4f7f5e9 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/SimpleRandomNumberGeneratorId.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/SimpleRandomNumberGeneratorId.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.stochastics.support; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.SimpleGlobalPropertyId; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractException; public class SimpleRandomNumberGeneratorId implements RandomNumberGeneratorId { private final Object value; diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/StochasticsError.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/StochasticsError.java index 0d3b32804..9411a5c6d 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/StochasticsError.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/StochasticsError.java @@ -1,7 +1,7 @@ package gov.hhs.aspr.ms.gcm.plugins.stochastics.support; -import util.errors.ContractError; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.errors.ContractError; +import gov.hhs.aspr.ms.util.errors.ContractException; /** * An enumeration supporting {@link ContractException} that acts as a general diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/WellState.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/WellState.java index 0525ae5d5..f2561dd5a 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/WellState.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/WellState.java @@ -2,8 +2,8 @@ import java.util.Arrays; +import gov.hhs.aspr.ms.util.errors.ContractException; import net.jcip.annotations.ThreadSafe; -import util.errors.ContractException; @ThreadSafe public class WellState { diff --git a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/StochasticsTestPluginFactory.java b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/StochasticsTestPluginFactory.java index b41ca84ea..432a7f595 100644 --- a/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/StochasticsTestPluginFactory.java +++ b/gcm/src/main/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/StochasticsTestPluginFactory.java @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * A static test support class for the {@linkplain StochasticsPlugin}. Provides diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorContext.java index b5bc40428..3628d823f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorContext.java @@ -26,11 +26,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestScenarioReport; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MultiKey; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_ActorContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorId.java index 80ea6ab6e..6220e33bc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ActorId.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_ActorId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManager.java index bfec5e0dd..c2cc0db31 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManager.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_DataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerContext.java index 8bef2216b..1b4503157 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerContext.java @@ -28,11 +28,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestScenarioReport; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_DataManagerContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerId.java index 16d15fc77..6fd64599c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DataManagerId.java @@ -9,9 +9,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_DataManagerId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Dimension.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Dimension.java index 9b818587e..6392f8d09 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Dimension.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Dimension.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_Dimension { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DimesionContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DimesionContext.java index bce2e63fd..12f3e1b29 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DimesionContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_DimesionContext.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_DimesionContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_EventFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_EventFilter.java index f6a16b024..0c42f3060 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_EventFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_EventFilter.java @@ -10,8 +10,8 @@ import org.apache.commons.math3.util.Pair; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_EventFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Experiment.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Experiment.java index e91b0c541..125adb7a9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Experiment.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Experiment.java @@ -18,11 +18,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestActorPlan; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; -import util.wrappers.MutableInteger; -import util.wrappers.MutableObject; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.wrappers.MutableObject; public class AT_Experiment { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentContext.java index c80702dda..6e9a04b06 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentContext.java @@ -20,10 +20,10 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.nucleus.util.TriConsumer; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; -import util.wrappers.MutableDouble; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableDouble; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_ExperimentContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentParameterData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentParameterData.java index 30873288a..a12cc7c23 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentParameterData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentParameterData.java @@ -15,10 +15,10 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ExperimentParameterData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStateManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStateManager.java index 272aec3c4..22e5faa60 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStateManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStateManager.java @@ -24,10 +24,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_ExperimentStateManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStatusConsole.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStatusConsole.java index 1267de0fd..b06054ed3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStatusConsole.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ExperimentStatusConsole.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ExperimentStatusConsole { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunction.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunction.java index c8afe8a22..b57d169d6 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunction.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunction.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_IdentifiableFunction { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunctionMap.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunctionMap.java index 1fc112253..fd01f21c0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunctionMap.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_IdentifiableFunctionMap.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_IdentifiableFunctionMap { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_NucleusError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_NucleusError.java index 29d200e2b..27648712b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_NucleusError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_NucleusError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_NucleusError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plan.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plan.java index 7019be572..d9e584d9c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plan.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plan.java @@ -9,9 +9,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_Plan { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PlanQueueData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PlanQueueData.java index 5e29c5441..6a13e98bc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PlanQueueData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PlanQueueData.java @@ -13,9 +13,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PlanQueueData { class TestPlanData1 implements PlanData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plugin.java index 3f9214657..94767cf52 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Plugin.java @@ -14,9 +14,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_Plugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginContext.java index 2f2198656..3602a7e70 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginContext.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestDataManager; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_PluginContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginDataBuilderContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginDataBuilderContext.java index c52482c85..ff936347b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginDataBuilderContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PluginDataBuilderContext.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PluginDataBuilderContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PrioritizedPlanData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PrioritizedPlanData.java index de9d6b17b..1d2448dbe 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PrioritizedPlanData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_PrioritizedPlanData.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PrioritizedPlanData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportContext.java index aa02fb8d9..1aea1f3d7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportContext.java @@ -28,10 +28,10 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestReportPlan; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_ReportContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportId.java index 0f428d010..2cd447b47 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_ReportId.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_ReportId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimplePluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimplePluginId.java index e61c1b29d..00ad9206e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimplePluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimplePluginId.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_SimplePluginId { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Simulation.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Simulation.java index fce5e24d6..4b51b8c10 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Simulation.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_Simulation.java @@ -17,11 +17,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestOutputConsumer; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_Simulation { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationState.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationState.java index a9f467cab..f298e396e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationState.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationState.java @@ -14,9 +14,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_SimulationState { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationStateCollector.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationStateCollector.java index 8c0ed1fb8..2f84aaf75 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationStateCollector.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_SimulationStateCollector.java @@ -14,9 +14,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_SimulationStateCollector { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_StatusConsoleState.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_StatusConsoleState.java index 06fef8903..427871cd5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_StatusConsoleState.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/AT_StatusConsoleState.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StatusConsoleState { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityActor.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityActor.java index b07e33267..b76b6ba1c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityActor.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityActor.java @@ -12,9 +12,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.Simulation; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestOutputConsumer; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RunContinuityActor { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityError.java index a8c37f1b8..6314249ac 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RunContinuityError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlanData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlanData.java index e506ae18a..6c03c745a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlanData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlanData.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RunContinuityPlanData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlugin.java index d40f30c3d..c6b1a9b93 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPlugin.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.PluginData; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_RunContinuityPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginData.java index 823a17c06..df4e4f221 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginData.java @@ -14,9 +14,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.ActorContext; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RunContinuityPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginId.java index c3c8c5063..d1c302b4a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/runcontinuityplugin/AT_RunContinuityPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_RunContinuityPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActor.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActor.java index ddcd9daf3..af023c27a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActor.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActor.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.ActorContext; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_TestActor { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActorPlan.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActorPlan.java index fd845110d..9df1e3562 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActorPlan.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestActorPlan.java @@ -11,9 +11,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestActorPlan { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManager.java index 1f12fdc1e..229474633 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManager.java @@ -11,10 +11,10 @@ import gov.hhs.aspr.ms.gcm.nucleus.DataManagerContext; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_TestDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManagerPlan.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManagerPlan.java index 2ecffc133..06583d852 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManagerPlan.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestDataManagerPlan.java @@ -11,9 +11,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestDataManagerPlan { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestError.java index ec056382b..0588313ac 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestOutputConsumer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestOutputConsumer.java index 944e2c0d5..2bbcbed61 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestOutputConsumer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestOutputConsumer.java @@ -14,11 +14,11 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestOutputConsumer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlanDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlanDataManager.java index 8bf26b9a1..dafea8f5f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlanDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlanDataManager.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.DataManagerContext; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestPlanDataManager { private static class TestDataManager1 extends TestDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlugin.java index 7f8eff59c..9a707008b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPlugin.java @@ -12,8 +12,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.PluginData; import gov.hhs.aspr.ms.gcm.nucleus.Simulation; -import util.annotations.UnitTestMethod; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_TestPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginData.java index ce61cd971..611e917f3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginData.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.PluginId; import gov.hhs.aspr.ms.gcm.nucleus.SimplePluginId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginFactory.java index 49e574f03..19d34521a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginFactory.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.NucleusError; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_TestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginId.java index d90e79437..9c7e7aadb 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_TestPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReport.java index 6ec4a5fa5..62fe2fe30 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReport.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.nucleus.ReportContext; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_TestReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReportPlan.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReportPlan.java index fdc5f8e31..9d39fa047 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReportPlan.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestReportPlan.java @@ -11,9 +11,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestReportPlan { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestScenarioReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestScenarioReport.java index 4642611ea..fea41a038 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestScenarioReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestScenarioReport.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestScenarioReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestSimulation.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestSimulation.java index e16d8bc1b..36b27b6a5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestSimulation.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/testsupport/testplugin/AT_TestSimulation.java @@ -20,9 +20,9 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.runcontinuityplugin.RunContinuityPlanData; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.runcontinuityplugin.RunContinuityPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.runcontinuityplugin.RunContinuityPluginData; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_TestSimulation { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/util/AT_TriConsumer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/util/AT_TriConsumer.java index 665f1a6d4..7f9227395 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/util/AT_TriConsumer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/nucleus/util/AT_TriConsumer.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TriConsumer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPlugin.java index 7663f2ae7..43998428b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPlugin.java @@ -14,7 +14,7 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.reports.GlobalPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GlobalPropertiesPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPluginId.java index 13dc48c76..714a1b356 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/AT_GlobalPropertiesPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_GlobalPropertiesPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesDataManager.java index 0a1fa9690..a98e895c6 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesDataManager.java @@ -44,13 +44,13 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.GlobalPropertiesTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.TestAuxiliaryGlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.TestGlobalPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; public final class AT_GlobalPropertiesDataManager { /** diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesPluginData.java index ee7c3307e..573c63738 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/datamanagers/AT_GlobalPropertiesPluginData.java @@ -25,9 +25,9 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.TestGlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GlobalPropertiesPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyDefinitionEvent.java index 39c3d5d8c..1dc36c785 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyDefinitionEvent.java @@ -8,9 +8,9 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.SimpleGlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GlobalPropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyUpdateEvent.java index a5cb73409..b8b9c76d5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/events/AT_GlobalPropertyUpdateEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GlobalPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReport.java index 8db94cdfd..2d3e13837 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReport.java @@ -39,9 +39,9 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GlobalPropertyReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReportPluginData.java index f89c4b813..99b625918 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/reports/AT_GlobalPropertyReportPluginData.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GlobalPropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertiesError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertiesError.java index ad3a9189a..e712124ee 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertiesError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertiesError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GlobalPropertiesError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyDimension.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyDimension.java index e23f38452..54aa39fc0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyDimension.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyDimension.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.TestGlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GlobalPropertyDimension { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyInitialization.java index b64497942..8739b9655 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_GlobalPropertyInitialization.java @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GlobalPropertyInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_SimpleGlobalPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_SimpleGlobalPropertyId.java index efa3ea374..0a12e7a98 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_SimpleGlobalPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/support/AT_SimpleGlobalPropertyId.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_SimpleGlobalPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_GlobalPropertiesTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_GlobalPropertiesTestPluginFactory.java index 828124bf4..bffe147d2 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_GlobalPropertiesTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_GlobalPropertiesTestPluginFactory.java @@ -30,10 +30,10 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.testsupport.GlobalPropertiesTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_GlobalPropertiesTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestAuxiliaryGlobalPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestAuxiliaryGlobalPropertyId.java index ee43ca391..3822dbeb8 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestAuxiliaryGlobalPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestAuxiliaryGlobalPropertyId.java @@ -16,9 +16,9 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestAuxiliaryGlobalPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestGlobalPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestGlobalPropertyId.java index dc98c6875..fa3d68ac3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestGlobalPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/globalproperties/testsupport/AT_TestGlobalPropertyId.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestGlobalPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPlugin.java index 02b818b93..724de1225 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPlugin.java @@ -18,7 +18,7 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPluginId; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupsPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPluginId.java index ac19fe287..634655e99 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/AT_GroupsPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_GroupsPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager.java index 90c08414f..db553bd32 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager.java @@ -59,13 +59,13 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableInteger; -import util.wrappers.MutableObject; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.wrappers.MutableObject; public class AT_GroupsDataManager { /** diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager_Continuity.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager_Continuity.java index 26e77d925..8c4df3560 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager_Continuity.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsDataManager_Continuity.java @@ -47,7 +47,7 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupsDataManager_Continuity { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsPluginData.java index b65910107..668815c2b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/datamanagers/AT_GroupsPluginData.java @@ -36,11 +36,11 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_GroupsPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupAdditionEvent.java index e817619c2..76d360e4c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupAdditionEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupImminentRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupImminentRemovalEvent.java index ef0e9ae10..15d693bc9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupImminentRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupImminentRemovalEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupImminentRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipAdditionEvent.java index 63473632c..3cdb2a294 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipAdditionEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupMembershipAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipRemovalEvent.java index 4cdab8ca7..2216a3dc2 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupMembershipRemovalEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupMembershipRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyDefinitionEvent.java index bccb25770..02a984306 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyDefinitionEvent.java @@ -12,9 +12,9 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GroupPropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyUpdateEvent.java index 02157ef1b..360052c25 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupPropertyUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupTypeAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupTypeAdditionEvent.java index cbc8989be..0e1550076 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupTypeAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/events/AT_GroupTypeAdditionEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupTypeAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReport.java index c28cabd2f..9ee0a67cd 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReport.java @@ -25,8 +25,8 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupPopulationReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReportPluginData.java index 69d572593..2fda7d2a2 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPopulationReportPluginData.java @@ -16,9 +16,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupPopulationReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReport.java index 7ee0f2057..ee924edc8 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReport.java @@ -33,9 +33,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_GroupPropertyReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReportPluginData.java index 79ba98114..e6ef1bd95 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/reports/AT_GroupPropertyReportPluginData.java @@ -24,10 +24,10 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_GroupPropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupConstructionInfo.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupConstructionInfo.java index 8abb33461..81cc1aa8d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupConstructionInfo.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupConstructionInfo.java @@ -13,9 +13,9 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_GroupConstructionInfo { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupError.java index be743c196..5881fd4c1 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupId.java index 1a756bf4c..bcb02b8c3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupId.java @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GroupId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupLabeler.java index c0ea1a8fd..be709bbbf 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupLabeler.java @@ -31,8 +31,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_GroupLabeler { private static class LocalGroupLabeler extends GroupLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupMemberFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupMemberFilter.java index 6fb46ab5d..4f4eee221 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupMemberFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupMemberFilter.java @@ -29,9 +29,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_GroupMemberFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDefinitionInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDefinitionInitialization.java index 238112d5c..084617cf5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDefinitionInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDefinitionInitialization.java @@ -16,9 +16,9 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupPropertyDefinitionInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDimension.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDimension.java index 5f52b53da..d838c49da 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDimension.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyDimension.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupPropertyDimension { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyValue.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyValue.java index 4d49be494..971445c78 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyValue.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupPropertyValue.java @@ -9,10 +9,10 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupPropertyValue { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupSampler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupSampler.java index 3ee8d7395..6a08b684b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupSampler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupSampler.java @@ -10,7 +10,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_GroupSampler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypeCountMap.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypeCountMap.java index fd23ef129..fd2f40d32 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypeCountMap.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypeCountMap.java @@ -14,9 +14,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.testsupport.TestGroupTypeId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * Test class for {@link GroupTypeCountMap} diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypesForPersonFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypesForPersonFilter.java index 7c89f184e..5785c0cda 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypesForPersonFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupTypesForPersonFilter.java @@ -30,10 +30,10 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupTypesForPersonFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonAndGroupTypeFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonAndGroupTypeFilter.java index d5797a141..f8e151ab0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonAndGroupTypeFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonAndGroupTypeFilter.java @@ -30,10 +30,10 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupsForPersonAndGroupTypeFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonFilter.java index 255fd874f..b48dfcb61 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/support/AT_GroupsForPersonFilter.java @@ -29,10 +29,10 @@ import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_GroupsForPersonFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_GroupsTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_GroupsTestPluginFactory.java index 0e5636d08..23ce6eca3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_GroupsTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_GroupsTestPluginFactory.java @@ -43,11 +43,11 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; @Testable public class AT_GroupsTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupPropertyId.java index 6a4be7bc8..272132c12 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupPropertyId.java @@ -14,8 +14,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestAuxiliaryGroupPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupTypeId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupTypeId.java index 99648a83b..da55e114a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupTypeId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestAuxiliaryGroupTypeId.java @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestAuxiliaryGroupTypeId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupPropertyId.java index 1571262d2..2ceb46d77 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupPropertyId.java @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestGroupPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupTypeId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupTypeId.java index ad8bd5bbf..f5dc9d5f7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupTypeId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/groups/testsupport/AT_TestGroupTypeId.java @@ -19,9 +19,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.groups.support.GroupTypeId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestGroupTypeId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPlugin.java index fa4817787..e6a2696dc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPlugin.java @@ -21,8 +21,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.RegionsPluginId; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.resources.ResourcesPluginId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_MaterialsPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPluginId.java index b2279f9f9..4a5158277 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/AT_MaterialsPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_MaterialsPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager.java index 5e0728475..26811dc15 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager.java @@ -75,12 +75,12 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableLong; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableLong; public class AT_MaterialsDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager_Continuity.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager_Continuity.java index 244f9dd9c..66a9c5ca7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager_Continuity.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsDataManager_Continuity.java @@ -59,8 +59,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsDataManager_Continuity { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsPluginData.java index 287ea1723..c9387d307 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/datamanagers/AT_MaterialsPluginData.java @@ -37,10 +37,10 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_MaterialsPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAdditionEvent.java index 64ef500ff..e667593be 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAdditionEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BatchAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAmountUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAmountUpdateEvent.java index f8e2b3ef9..4c8f83e99 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAmountUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchAmountUpdateEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BatchAmountUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchImminentRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchImminentRemovalEvent.java index 05666d678..1490962a1 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchImminentRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchImminentRemovalEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BatchImminentRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyDefinitionEvent.java index 172956cb2..953369c9e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyDefinitionEvent.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestBatchPropertyId; import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_BatchPropertyDefinitionEvent { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyUpdateEvent.java index 52fe94dd0..e18e3faeb 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_BatchPropertyUpdateEvent.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestBatchPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_BatchPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialIdAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialIdAdditionEvent.java index 7f43d9f69..d2c38a4e5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialIdAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialIdAdditionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_MaterialIdAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerAdditionEvent.java index c2337338c..e950f1e83 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerAdditionEvent.java @@ -13,9 +13,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialsProducerId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsProducerAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyDefinitionEvent.java index ea42d2333..8f09d620a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyDefinitionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_MaterialsProducerPropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyUpdateEvent.java index dc3992d31..e850f8bd7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerPropertyUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_MaterialsProducerPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerResourceUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerResourceUpdateEvent.java index 7268ad080..4f346b65a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerResourceUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_MaterialsProducerResourceUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_MaterialsProducerResourceUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageAdditionEvent.java index 0350d8d7e..c5a75ee12 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageAdditionEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageImminentRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageImminentRemovalEvent.java index 1c5c48881..959e1543d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageImminentRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageImminentRemovalEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageImminentRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMaterialsProducerUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMaterialsProducerUpdateEvent.java index 79fe23fb1..a3188763c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMaterialsProducerUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMaterialsProducerUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageMaterialsProducerUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipAdditionEvent.java index a67ba0425..a3725b8a1 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipAdditionEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageMembershipAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipRemovalEvent.java index 79c7e997a..5c3fd642a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageMembershipRemovalEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageMembershipRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageOfferUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageOfferUpdateEvent.java index bcb653221..112d41e33 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageOfferUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/events/AT_StageOfferUpdateEvent.java @@ -3,8 +3,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.StageId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageOfferUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReport.java index 0bc634499..30d741a18 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReport.java @@ -40,9 +40,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_BatchStatusReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReportPluginData.java index dd4c4f197..3ac935d6b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_BatchStatusReportPluginData.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_BatchStatusReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReport.java index 5a7bc65a1..8da45abce 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReport.java @@ -31,9 +31,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_MaterialsProducerPropertyReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReportPluginData.java index 139bd90ef..e544580ee 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerPropertyReportPluginData.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsProducerPropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReport.java index 4440e6694..4b6bf5c6b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReport.java @@ -37,9 +37,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_MaterialsProducerResourceReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReportPluginData.java index b8f301f9f..fc328006a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_MaterialsProducerResourceReportPluginData.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsProducerResourceReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReport.java index f86810bba..7632a012b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReport.java @@ -28,10 +28,10 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_StageReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReportPluginData.java index 1c6e749de..0a05422e8 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/reports/AT_StageReportPluginData.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_StageReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchConstructionInfo.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchConstructionInfo.java index a33aa72f1..c6ad9c6a5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchConstructionInfo.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchConstructionInfo.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialId; import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialsProducerId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_BatchConstructionInfo { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchId.java index 098817d1c..083c151d0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchId.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BatchId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchPropertyDefinitionInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchPropertyDefinitionInitialization.java index e138b022b..d24ff165c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchPropertyDefinitionInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_BatchPropertyDefinitionInitialization.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_BatchPropertyDefinitionInitialization { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsError.java index 1cd1cade8..4d188c746 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_MaterialsError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerConstructionData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerConstructionData.java index 2338ff65b..8e3aa5081 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerConstructionData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerConstructionData.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsProducerConstructionData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerPropertyDefinitionInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerPropertyDefinitionInitialization.java index 107b2001f..ddb6474f7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerPropertyDefinitionInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_MaterialsProducerPropertyDefinitionInitialization.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_MaterialsProducerPropertyDefinitionInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageConversionInfo.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageConversionInfo.java index 53c19de8c..2eb460b7a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageConversionInfo.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageConversionInfo.java @@ -13,9 +13,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestBatchPropertyId; import gov.hhs.aspr.ms.gcm.plugins.materials.testsupport.TestMaterialId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_StageConversionInfo { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageId.java index 01a2456f5..fa32efd79 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/support/AT_StageId.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StageId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_MaterialsTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_MaterialsTestPluginFactory.java index 4e5cff010..95727ae4d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_MaterialsTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_MaterialsTestPluginFactory.java @@ -55,10 +55,10 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_MaterialsTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchConstructionInfo.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchConstructionInfo.java index d3d4dd077..6836a691a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchConstructionInfo.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchConstructionInfo.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsError; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestBatchConstructionInfo { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchPropertyId.java index 8fa353fb1..074e3739e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestBatchPropertyId.java @@ -15,8 +15,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.BatchPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestBatchPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialId.java index cf7e1a740..6f0d7ce29 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialId.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestMaterialId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerId.java index 5f04d8c92..407e57488 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerId.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestMaterialsProducerId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerPropertyId.java index ec7d47f80..da7258bef 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/materials/testsupport/AT_TestMaterialsProducerPropertyId.java @@ -15,8 +15,8 @@ import gov.hhs.aspr.ms.gcm.plugins.materials.support.MaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_TestMaterialsProducerPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPlugin.java index 51498929b..d790b2771 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPlugin.java @@ -19,8 +19,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.people.PeoplePluginId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPluginId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_PartitionsPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPluginId.java index bd34668b0..64a6d9e40 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/AT_PartitionsPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_PartitionsPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager.java index 795fcc45f..98d4a4468 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager.java @@ -52,11 +52,11 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public final class AT_PartitionsDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager_Continuity.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager_Continuity.java index 4bbd691e3..97c73232c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager_Continuity.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsDataManager_Continuity.java @@ -44,8 +44,8 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_PartitionsDataManager_Continuity { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsPluginData.java index a220665b8..3070b6536 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/datamanagers/AT_PartitionsPluginData.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.PluginData; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PartitionsPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_DegeneratePopulationPartitionImpl.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_DegeneratePopulationPartitionImpl.java index 6657ec4c4..bdb6b9b24 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_DegeneratePopulationPartitionImpl.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_DegeneratePopulationPartitionImpl.java @@ -32,10 +32,10 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_DegeneratePopulationPartitionImpl { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Equality.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Equality.java index f0a229790..9a83fa0e0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Equality.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Equality.java @@ -10,9 +10,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_Equality { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_FilterSensitivity.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_FilterSensitivity.java index d3cde01d4..96e79657a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_FilterSensitivity.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_FilterSensitivity.java @@ -14,8 +14,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.PartitionsTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.TestPartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_FilterSensitivity { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelSet.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelSet.java index 005748f49..33b885992 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelSet.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelSet.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_LabelSet { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelerSensitivity.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelerSensitivity.java index e5fa92777..a9b471823 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelerSensitivity.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_LabelerSensitivity.java @@ -11,8 +11,8 @@ import gov.hhs.aspr.ms.gcm.nucleus.Event; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_LabelerSensitivity { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Partition.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Partition.java index 4eeecb854..9a4d08679 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Partition.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_Partition.java @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.AttributeFilter; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.TestAttributeId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_Partition { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionError.java index 9169b4738..b1d313c71 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PartitionError { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionSampler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionSampler.java index d3a41b37a..2648a1d4a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionSampler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PartitionSampler.java @@ -9,7 +9,7 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PartitionSampler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PopulationPartitionImpl.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PopulationPartitionImpl.java index 84774ae38..e459f6359 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PopulationPartitionImpl.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/AT_PopulationPartitionImpl.java @@ -38,9 +38,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PopulationPartitionImpl { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_BasePeopleContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_BasePeopleContainer.java index 6b38344bf..0415bc5b4 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_BasePeopleContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_BasePeopleContainer.java @@ -5,8 +5,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BasePeopleContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_IntSetPeopleContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_IntSetPeopleContainer.java index 3840edb93..ba67d776a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_IntSetPeopleContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_IntSetPeopleContainer.java @@ -8,9 +8,9 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestField; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_IntSetPeopleContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_TreeBitSetPeopleContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_TreeBitSetPeopleContainer.java index 1f22c14d2..6841698dc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_TreeBitSetPeopleContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/AT_TreeBitSetPeopleContainer.java @@ -10,9 +10,9 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_TreeBitSetPeopleContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/MT_ArrayIntSet.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/MT_ArrayIntSet.java index 4b4141e8a..bbbde59b9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/MT_ArrayIntSet.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/containers/MT_ArrayIntSet.java @@ -12,7 +12,7 @@ //import java.util.Random; //import java.util.Set; // -//import util.time.TimeElapser; +//import gov.hhs.aspr.ms.util.time.TimeElapser; /** * Test class for {@link ArrayIntSet} diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_AndFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_AndFilter.java index b9c94ff54..64e6512a3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_AndFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_AndFilter.java @@ -19,10 +19,10 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_AndFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_FalseFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_FalseFilter.java index 11102cdae..eecbd3401 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_FalseFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_FalseFilter.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_FalseFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_Filter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_Filter.java index 2e80ff91b..16a605fc7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_Filter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_Filter.java @@ -21,8 +21,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.TestPartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_Filter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_NotFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_NotFilter.java index 2a9cf2bfd..911016116 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_NotFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_NotFilter.java @@ -18,10 +18,10 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_NotFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_OrFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_OrFilter.java index 9fab290be..8842477a5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_OrFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_OrFilter.java @@ -19,10 +19,10 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionError; import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_OrFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_TrueFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_TrueFilter.java index 942bef6a1..38dd93207 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_TrueFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/support/filters/AT_TrueFilter.java @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.PartitionsContext; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TrueFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_FunctionalAttributeLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_FunctionalAttributeLabeler.java index 0c0b005d2..14f143bf7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_FunctionalAttributeLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_FunctionalAttributeLabeler.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.AttributeId; -import util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; public class AT_FunctionalAttributeLabeler { private static enum LocalAttributeId implements AttributeId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_PartitionsTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_PartitionsTestPluginFactory.java index d78a9e621..5882d9935 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_PartitionsTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_PartitionsTestPluginFactory.java @@ -35,9 +35,9 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_PartitionsTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_TestPartitionsContext.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_TestPartitionsContext.java index 5884ebddd..0a7d95243 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_TestPartitionsContext.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/AT_TestPartitionsContext.java @@ -15,8 +15,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.AttributesDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestPartitionsContext { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesDataManager.java index a79e1c890..6ed0ea2a0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesDataManager.java @@ -40,11 +40,11 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_AttributesDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPlugin.java index 8282be864..e2d666145 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPlugin.java @@ -27,7 +27,7 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPlugin; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_AttributesPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginData.java index 5c824da99..385ce0881 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginData.java @@ -29,10 +29,10 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.TestAttributeId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_AttributesPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginId.java index c4be291b4..a8db9706f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/AT_AttributesPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_AttributesPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/events/AT_AttributeUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/events/AT_AttributeUpdateEvent.java index fe883fef6..61774861d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/events/AT_AttributeUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/events/AT_AttributeUpdateEvent.java @@ -7,8 +7,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.AttributeId; import gov.hhs.aspr.ms.gcm.plugins.partitions.testsupport.attributes.support.TestAttributeId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_AttributeUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeDefinition.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeDefinition.java index 7e00b9284..a313fca4c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeDefinition.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeDefinition.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_AttributeDefinition { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeError.java index c9fdb2ae3..c6857a120 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_AttributeError { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeFilter.java index c5c1bd590..38ade0b38 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeFilter.java @@ -42,11 +42,11 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public final class AT_AttributeFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeLabeler.java index 0b4cc02b0..91a5dfe40 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_AttributeLabeler.java @@ -27,10 +27,10 @@ import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeopleDataManager; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_AttributeLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_SimpleAttributeId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_SimpleAttributeId.java index edbde4118..f751e4022 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_SimpleAttributeId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_SimpleAttributeId.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_SimpleAttributeId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_TestAttributeId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_TestAttributeId.java index cef0e7b6e..89ec2c93a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_TestAttributeId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/partitions/testsupport/attributes/support/AT_TestAttributeId.java @@ -13,9 +13,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestAttributeId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePlugin.java index 19598b54a..76cc44929 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePlugin.java @@ -7,7 +7,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.Plugin; import gov.hhs.aspr.ms.gcm.plugins.people.datamanagers.PeoplePluginData; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PeoplePlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePluginId.java index 74869de32..75e1a9b01 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/AT_PeoplePluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_PeoplePluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeopleDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeopleDataManager.java index 9ad23ad1f..56e35517b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeopleDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeopleDataManager.java @@ -42,9 +42,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonRange; import gov.hhs.aspr.ms.gcm.plugins.people.testsupport.PeopleTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.people.testsupport.PeopleTestPluginFactory.Factory; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_PeopleDataManager { /** diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeoplePluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeoplePluginData.java index 85350bf88..af57872c3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeoplePluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/datamanagers/AT_PeoplePluginData.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonRange; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_PeoplePluginData { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonAdditionEvent.java index 50d4a24ff..e3773023c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonAdditionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentAdditionEvent.java index de5db8742..bf3c2778a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentAdditionEvent.java @@ -8,9 +8,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonConstructionData; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonImminentAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentRemovalEvent.java index e12a3ffb4..c42da9062 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonImminentRemovalEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonImminentRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonRemovalEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonRemovalEvent.java index 346c5befe..fb0189726 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonRemovalEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/events/AT_PersonRemovalEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonError; import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonRemovalEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonConstructionData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonConstructionData.java index 9714c365d..07b506c4e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonConstructionData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonConstructionData.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public final class AT_PersonConstructionData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonError.java index 9233e3fa9..e57fe06d7 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonId.java index bef4e280a..c6ed055cd 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonId.java @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_PersonId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonRange.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonRange.java index b3d9b9066..b2e22f28e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonRange.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/support/AT_PersonRange.java @@ -11,10 +11,10 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonRange { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/AT_PeopleTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/AT_PeopleTestPluginFactory.java index 9389165da..3075cd102 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/AT_PeopleTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/people/testsupport/AT_PeopleTestPluginFactory.java @@ -26,9 +26,9 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_PeopleTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPlugin.java index 398973bfd..bc3056d43 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPlugin.java @@ -18,7 +18,7 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.RegionsPluginId; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonPropertiesPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPluginId.java index 0302335ff..d17fb7936 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/AT_PersonPropertiesPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_PersonPropertiesPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyDataManager.java index e2975e3fb..0d7832d2a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyDataManager.java @@ -67,13 +67,13 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableBoolean; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public final class AT_PersonPropertyDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyPluginData.java index 923e9cda1..69eae30f1 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/datamanagers/AT_PersonPropertyPluginData.java @@ -26,11 +26,11 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public class AT_PersonPropertyPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyDefinitionEvent.java index ca910ecc1..8c5ddc230 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyDefinitionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonPropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyUpdateEvent.java index 7980e2c4e..d87839d36 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/events/AT_PersonPropertyUpdateEvent.java @@ -7,8 +7,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReport.java index 25b0aaebe..73081d0d6 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReport.java @@ -36,10 +36,10 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonPropertyInteractionReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReportPluginData.java index 09099600f..9f9eac346 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyInteractionReportPluginData.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonPropertyInteractionReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReport.java index 97719482e..a451a0664 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReport.java @@ -43,9 +43,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonPropertyReport { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReportPluginData.java index 6afe7e609..7b9926570 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/reports/AT_PersonPropertyReportPluginData.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonPropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDefinitionInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDefinitionInitialization.java index d89b57e6e..a88e1885a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDefinitionInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDefinitionInitialization.java @@ -17,9 +17,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonPropertyDefinitionInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDimension.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDimension.java index 074a37a7b..2d6ebe490 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDimension.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyDimension.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonPropertyDimension { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyError.java index 7add226d3..54fe9b6d2 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonPropertyError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyFilter.java index 140abd341..75de0e0d3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyFilter.java @@ -30,10 +30,10 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonPropertyFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyInitialization.java index af15751c9..add5b6c99 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyInitialization.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonPropertyInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyLabeler.java index 82584e34b..4beb089d9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/support/AT_PersonPropertyLabeler.java @@ -27,9 +27,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.PersonPropertiesTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_PersonPropertyLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_PersonPropertiesTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_PersonPropertiesTestPluginFactory.java index 1a138a953..3a1fddfae 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_PersonPropertiesTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_PersonPropertiesTestPluginFactory.java @@ -41,10 +41,10 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_PersonPropertiesTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestAuxiliaryPersonPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestAuxiliaryPersonPropertyId.java index 96d1ec161..70af6c999 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestAuxiliaryPersonPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestAuxiliaryPersonPropertyId.java @@ -16,9 +16,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestAuxiliaryPersonPropertyId { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyId.java index 9a1635d7a..a21ee6720 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyId.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestPersonPropertyId implements PersonPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyLabeler.java index dedff81a5..57b51816c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/personproperties/testsupport/AT_TestPersonPropertyLabeler.java @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.plugins.personproperties.support.PersonPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestPersonPropertyLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPlugin.java index 80389def9..92f81ae30 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPlugin.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PropertiesPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPluginId.java index 691ae887c..211ee90a1 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/AT_PropertiesPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_PropertiesPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_BooleanPropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_BooleanPropertyManager.java index 6108b84be..6d5e9f61b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_BooleanPropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_BooleanPropertyManager.java @@ -19,11 +19,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_DoublePropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_DoublePropertyManager.java index 276d770c1..1c7ed4dca 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_DoublePropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_DoublePropertyManager.java @@ -17,11 +17,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_EnumPropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_EnumPropertyManager.java index 121639113..2882b7728 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_EnumPropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_EnumPropertyManager.java @@ -17,11 +17,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_FloatPropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_FloatPropertyManager.java index 97738234f..2a128b50b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_FloatPropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_FloatPropertyManager.java @@ -17,11 +17,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_IntPropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_IntPropertyManager.java index d5bc20924..1cd354059 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_IntPropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_IntPropertyManager.java @@ -19,11 +19,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestDataManager; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_ObjectPropertyManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_ObjectPropertyManager.java index 18b79c5d6..01f25ab4c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_ObjectPropertyManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_ObjectPropertyManager.java @@ -17,11 +17,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; /** * Common interface to all person property managers. A person property manager diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyDefinition.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyDefinition.java index b8d7ff050..a9a7d25a5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyDefinition.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyDefinition.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition.Builder; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PropertyDefinition { private static enum BooleanType { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyError.java index 2d812adc6..a1c24d587 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/AT_PropertyError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PropertyError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_BooleanContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_BooleanContainer.java index e89f0def4..8e5158ea3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_BooleanContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_BooleanContainer.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_BooleanContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_DoubleValueContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_DoubleValueContainer.java index 63c142112..f89d17afa 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_DoubleValueContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_DoubleValueContainer.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_DoubleValueContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_EnumContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_EnumContainer.java index 9ec110619..a15c8343e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_EnumContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_EnumContainer.java @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_EnumContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_FloatValueContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_FloatValueContainer.java index f03578953..867fd53ef 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_FloatValueContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_FloatValueContainer.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_FloatValueContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_IntValueContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_IntValueContainer.java index ee3402603..1d1babc57 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_IntValueContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_IntValueContainer.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.properties.support.arraycontainers.IntValueContainer.IntValueType; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_IntValueContainer { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_ObjectValueContainer.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_ObjectValueContainer.java index 0b1ed045c..b6c483830 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_ObjectValueContainer.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/properties/support/arraycontainers/AT_ObjectValueContainer.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ObjectValueContainer { private Iterator getEmptyIndexIterator() { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPlugin.java index c5cb1e91f..34cfb8cd8 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPlugin.java @@ -17,7 +17,7 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.reports.RegionTransferReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RegionPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPluginId.java index 9f9020fca..e0babae57 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/AT_RegionPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_RegionPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsDataManager.java index 0a67f6bec..c8456dc54 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsDataManager.java @@ -65,13 +65,13 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionPropertyId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableDouble; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableDouble; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_RegionsDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsPluginData.java index 2a26178af..0d16f2368 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/datamanagers/AT_RegionsPluginData.java @@ -31,10 +31,10 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionPropertyId; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; /** * Test unit for {@linkplain RegionsPluginData}. Tests for diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_PersonRegionUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_PersonRegionUpdateEvent.java index 0d899f176..1680d52cf 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_PersonRegionUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_PersonRegionUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonRegionUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionAdditionEvent.java index 717ba0117..bcd4ee1f9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionAdditionEvent.java @@ -13,9 +13,9 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.support.SimpleRegionId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyDefinitionEvent.java index 57a09961d..38426a72e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyDefinitionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_RegionPropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyUpdateEvent.java index 9457e1990..d9bff439f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/events/AT_RegionPropertyUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RegionPropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReport.java index 7e5b704cd..e82a94552 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReport.java @@ -35,9 +35,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_RegionPropertyReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReportPluginData.java index e32d7c8d7..80772ee03 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionPropertyReportPluginData.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionPropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReport.java index c0394fe22..4e85efcf6 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReport.java @@ -36,10 +36,10 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_RegionTransferReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReportPluginData.java index 1dbcca9e0..814da3e26 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/reports/AT_RegionTransferReportPluginData.java @@ -16,9 +16,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionTransferReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionConstructionData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionConstructionData.java index cde817896..5248bbdb9 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionConstructionData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionConstructionData.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionConstructionData { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionError.java index aefc9da73..3e3cb3908 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RegionError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionFilter.java index d648eddb1..b0ace3967 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionFilter.java @@ -30,11 +30,11 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.events.PersonRegionUpdateEvent; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.RegionsTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.RegionsTestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; public class AT_RegionFilter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionLabeler.java index c722bec5c..5771b0e36 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionLabeler.java @@ -30,9 +30,9 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.RegionsTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_RegionLabeler { private static class LocalRegionLabeler extends RegionLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDefinitionInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDefinitionInitialization.java index 866377454..bbff1eccc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDefinitionInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDefinitionInitialization.java @@ -13,9 +13,9 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionPropertyDefinitionInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDimension.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDimension.java index b9cc290d2..292b45592 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDimension.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_RegionPropertyDimension.java @@ -21,9 +21,9 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.datamanagers.RegionsPluginData; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.plugins.regions.testsupport.TestRegionPropertyId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_RegionPropertyDimension { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionId.java index 59688c9eb..776827a16 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionId.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_SimpleRegionId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionPropertyId.java index d81e49f0b..ccaed457d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/support/AT_SimpleRegionPropertyId.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_SimpleRegionPropertyId { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_RegionsTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_RegionsTestPluginFactory.java index f62a0e346..7a122f729 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_RegionsTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_RegionsTestPluginFactory.java @@ -37,10 +37,10 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_RegionsTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionId.java index 63eff8a8e..d7180f91a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionId.java @@ -14,9 +14,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestRegionId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionPropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionPropertyId.java index 3fd952ccb..0cd08953c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionPropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/regions/testsupport/AT_TestRegionPropertyId.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionPropertyId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestRegionPropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportPlugin.java index f14d38f0b..a99c85cee 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportPlugin.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.Plugin; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ReportPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportsPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportsPluginId.java index b658ed461..e258a1ae5 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportsPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/AT_ReportsPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_ReportsPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ExperimentLineWriter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ExperimentLineWriter.java index 2f5313985..dab425dd3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ExperimentLineWriter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ExperimentLineWriter.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.ExperimentContext; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ExperimentLineWriter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_LineWriter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_LineWriter.java index ad2376654..c1593a7dc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_LineWriter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_LineWriter.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.ExperimentContext; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_LineWriter { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_NIOReportItemHandler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_NIOReportItemHandler.java index bbe0224dd..f0e6b05d3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_NIOReportItemHandler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_NIOReportItemHandler.java @@ -9,9 +9,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.nucleus.ExperimentContext; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_NIOReportItemHandler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReport.java index 6060fe160..1437544d0 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReport.java @@ -22,11 +22,11 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPlugin; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestSimulation; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableDouble; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableDouble; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_PeriodicReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReportPluginData.java index 2c9de9a3c..09d014a9c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_PeriodicReportPluginData.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PeriodicReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportError.java index 69d3c4006..3df6370ad 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ReportError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportHeader.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportHeader.java index 7a5d6df50..d690c26fb 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportHeader.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportHeader.java @@ -13,9 +13,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ReportHeader { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportItem.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportItem.java index 06648f95f..e299534e3 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportItem.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_ReportItem.java @@ -12,9 +12,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public final class AT_ReportItem { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_SimpleReportLabel.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_SimpleReportLabel.java index 8b37e763f..907861bbe 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_SimpleReportLabel.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/reports/support/AT_SimpleReportLabel.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_SimpleReportLabel { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPlugin.java index cca21150c..8d363a85e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPlugin.java @@ -19,7 +19,7 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.reports.PersonResourceReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.resources.reports.ResourcePropertyReportPluginData; import gov.hhs.aspr.ms.gcm.plugins.resources.reports.ResourceReportPluginData; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ResourcesPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPluginId.java index b93a482bd..794054054 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/AT_ResourcesPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_ResourcesPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesDataManager.java index 1e2a8635f..bdc14f803 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesDataManager.java @@ -71,14 +71,14 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; -import util.wrappers.MutableDouble; -import util.wrappers.MutableInteger; -import util.wrappers.MutableObject; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.wrappers.MutableDouble; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.wrappers.MutableObject; public final class AT_ResourcesDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesPluginData.java index 42c27ef73..e212ed820 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/datamanagers/AT_ResourcesPluginData.java @@ -30,10 +30,10 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MultiKey; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MultiKey; public final class AT_ResourcesPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_PersonResourceUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_PersonResourceUpdateEvent.java index f8d095fbb..be6dfd34b 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_PersonResourceUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_PersonResourceUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonResourceUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_RegionResourceUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_RegionResourceUpdateEvent.java index 19be0a41f..dce984214 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_RegionResourceUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_RegionResourceUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_RegionResourceUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourceIdAdditionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourceIdAdditionEvent.java index d5bcebc2c..c6f8fded4 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourceIdAdditionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourceIdAdditionEvent.java @@ -7,9 +7,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_ResourceIdAdditionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyDefinitionEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyDefinitionEvent.java index 8ac751044..4ea85446e 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyDefinitionEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyDefinitionEvent.java @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_ResourcePropertyDefinitionEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyUpdateEvent.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyUpdateEvent.java index 5d8ac983e..1642f1750 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyUpdateEvent.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/events/AT_ResourcePropertyUpdateEvent.java @@ -4,8 +4,8 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ResourcePropertyUpdateEvent { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReport.java index 5b8731485..d8cbdf294 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReport.java @@ -23,9 +23,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_PersonResourceReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReportPluginData.java index 0803b7bbd..79dbede8d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_PersonResourceReportPluginData.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_PersonResourceReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReport.java index cc12ecd27..c0effba7f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReport.java @@ -23,10 +23,10 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyInitialization; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; public class AT_ResourcePropertyReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReportPluginData.java index f287fbb17..ce67e2f96 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourcePropertyReportPluginData.java @@ -15,9 +15,9 @@ import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportError; import gov.hhs.aspr.ms.gcm.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.plugins.reports.support.SimpleReportLabel; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ResourcePropertyReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReport.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReport.java index 8d99adc4b..e34a7f371 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReport.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReport.java @@ -20,9 +20,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTag; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ResourceReport { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReportPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReportPluginData.java index 45936dda2..668c9c5fd 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReportPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/reports/AT_ResourceReportPluginData.java @@ -19,9 +19,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceError; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ResourceReportPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceError.java index c0d4ab981..533fa48d6 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_ResourceError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceFilter.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceFilter.java index c2cfd84ec..f3b89ecf8 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceFilter.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceFilter.java @@ -31,10 +31,10 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ResourceFilter { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceInitialization.java index 0c2804c7f..9d0552925 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceInitialization.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_ResourceInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceLabeler.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceLabeler.java index 589eb344d..4daf240fc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceLabeler.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourceLabeler.java @@ -32,9 +32,9 @@ import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.ResourcesTestPluginFactory.Factory; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsDataManager; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public final class AT_ResourceLabeler { private static class LocalResourceLabeler extends ResourceLabeler { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourcePropertyInitialization.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourcePropertyInitialization.java index feb6a2c46..27d07345c 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourcePropertyInitialization.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/support/AT_ResourcePropertyInitialization.java @@ -10,8 +10,8 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyError; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.plugins.resources.testsupport.TestResourcePropertyId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_ResourcePropertyInitialization { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_ResourcesTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_ResourcesTestPluginFactory.java index df06a2c36..a8a8df913 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_ResourcesTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_ResourcesTestPluginFactory.java @@ -44,10 +44,10 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_ResourcesTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourceId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourceId.java index 028746c94..c064a3a37 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourceId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourceId.java @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourceId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestResourceId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourcePropertyId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourcePropertyId.java index d9a96355f..ee8f6f857 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourcePropertyId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/resources/testsupport/AT_TestResourcePropertyId.java @@ -18,9 +18,9 @@ import gov.hhs.aspr.ms.gcm.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.plugins.resources.support.ResourcePropertyId; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableInteger; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableInteger; public class AT_TestResourcePropertyId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsDataManager.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsDataManager.java index a6bdee1a6..fde5075ae 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsDataManager.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsDataManager.java @@ -40,11 +40,11 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.StochasticsTestPluginFactory; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.StochasticsTestPluginFactory.Factory; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; public class AT_StochasticsDataManager { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPlugin.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPlugin.java index 836fd319c..7d5fbd3be 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPlugin.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPlugin.java @@ -12,7 +12,7 @@ import gov.hhs.aspr.ms.gcm.nucleus.testsupport.testplugin.TestPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StochasticsPlugin { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginData.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginData.java index 2af08391e..e14c6f75d 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginData.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginData.java @@ -24,9 +24,9 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.TestRandomGeneratorId; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_StochasticsPluginData { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginId.java index 9805e8191..1fab05033 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/AT_StochasticsPluginId.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestField; +import gov.hhs.aspr.ms.util.annotations.UnitTestField; public class AT_StochasticsPluginId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_SimpleRandomNumberGeneratorId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_SimpleRandomNumberGeneratorId.java index dbcd5ff23..ae738ee42 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_SimpleRandomNumberGeneratorId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_SimpleRandomNumberGeneratorId.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; public class AT_SimpleRandomNumberGeneratorId { @Test diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_StochasticsError.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_StochasticsError.java index 130c281df..5f760c51a 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_StochasticsError.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_StochasticsError.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_StochasticsError { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_Well.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_Well.java index f55dc4526..5e84bd505 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_Well.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_Well.java @@ -11,9 +11,9 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTestConstructor; -import util.annotations.UnitTestMethod; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_Well { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_WellState.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_WellState.java index 14331e497..015edbd19 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_WellState.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/support/AT_WellState.java @@ -14,10 +14,10 @@ import org.apache.commons.math3.random.RandomGenerator; import org.junit.jupiter.api.Test; -import util.annotations.UnitTag; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.annotations.UnitTag; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; public class AT_WellState { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_StochasticsTestPluginFactory.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_StochasticsTestPluginFactory.java index d33ca87c5..d0477f010 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_StochasticsTestPluginFactory.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_StochasticsTestPluginFactory.java @@ -23,10 +23,10 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.StochasticsError; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.plugins.stochastics.testsupport.StochasticsTestPluginFactory.Factory; -import util.annotations.UnitTestMethod; -import util.errors.ContractException; -import util.random.RandomGeneratorProvider; -import util.wrappers.MutableBoolean; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.errors.ContractException; +import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; +import gov.hhs.aspr.ms.util.wrappers.MutableBoolean; public class AT_StochasticsTestPluginFactory { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_TestRandomGeneratorId.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_TestRandomGeneratorId.java index 525fed2ab..a9af23965 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_TestRandomGeneratorId.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/plugins/stochastics/testsupport/AT_TestRandomGeneratorId.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.RandomNumberGeneratorId; -import util.annotations.UnitTestMethod; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; public class AT_TestRandomGeneratorId { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MetaInfoReportRunner.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MetaInfoReportRunner.java index 690240d91..c9feea48f 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MetaInfoReportRunner.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MetaInfoReportRunner.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.tools; -import util.meta.unittestcoverage.reports.MetaInfoReport; +import gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.MetaInfoReport; public class MetaInfoReportRunner { public static void main(String[] args) { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MissingTestsReportRunner.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MissingTestsReportRunner.java index 4e5f488d8..d87a60606 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MissingTestsReportRunner.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/MissingTestsReportRunner.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.tools; -import util.meta.unittestcoverage.reports.MissingTestsReport; +import gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.MissingTestsReport; public class MissingTestsReportRunner { public static void main(String[] args) { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/codestats/CodeCounts.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/codestats/CodeCounts.java index 1181da499..72e73c842 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/codestats/CodeCounts.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/codestats/CodeCounts.java @@ -1,6 +1,6 @@ package gov.hhs.aspr.ms.gcm.tools.codestats; -import util.meta.codecount.CodeCountReport; +import gov.hhs.aspr.ms.util.meta.codecount.CodeCountReport; public class CodeCounts { public static void main(String[] args) { diff --git a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/meta/plugindependency/PluginDependencyInfoGenerator.java b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/meta/plugindependency/PluginDependencyInfoGenerator.java index f7814770f..b391761fc 100644 --- a/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/meta/plugindependency/PluginDependencyInfoGenerator.java +++ b/gcm/src/test/java/gov/hhs/aspr/ms/gcm/tools/meta/plugindependency/PluginDependencyInfoGenerator.java @@ -47,12 +47,12 @@ import gov.hhs.aspr.ms.gcm.plugins.stochastics.StochasticsPluginId; import gov.hhs.aspr.ms.gcm.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.plugins.stochastics.support.WellState; -import util.graph.Graph; -import util.graph.GraphDepthEvaluator; -import util.graph.Graphs; -import util.graph.MutableGraph; -import util.meta.packagedependency.PackageDependencyData; -import util.path.MapPathSolver; +import gov.hhs.aspr.ms.util.graph.Graph; +import gov.hhs.aspr.ms.util.graph.GraphDepthEvaluator; +import gov.hhs.aspr.ms.util.graph.Graphs; +import gov.hhs.aspr.ms.util.graph.MutableGraph; +import gov.hhs.aspr.ms.util.meta.packagedependency.PackageDependencyData; +import gov.hhs.aspr.ms.util.path.MapPathSolver; /** * @@ -456,7 +456,7 @@ public PackageDependencyData execute() { // } if (pluginDependencyGraph.containsNode(originNode) && pluginDependencyGraph.containsNode(destinationNode)) { - Optional> optionalPath = mapPathSolver.getPath(originNode, destinationNode); + Optional> optionalPath = mapPathSolver.getPath(originNode, destinationNode); if (optionalPath.isEmpty()) { System.out.println("The package dependency of " + originNode + "->" + destinationNode + " violates the plugin dependency graph"); } From deaf280a4449ac82bab5e1af93df132fd4992669 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Sat, 3 Feb 2024 21:22:05 -0500 Subject: [PATCH 2/3] remove mockito dep --- gcm/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gcm/pom.xml b/gcm/pom.xml index d6942a5ee..a8cdbf8bd 100644 --- a/gcm/pom.xml +++ b/gcm/pom.xml @@ -72,12 +72,6 @@ util ${util.version} - - org.mockito - mockito-core - ${mockito-core.version} - test - org.jacoco jacoco-maven-plugin From d7bda82d686be85c794573410a58f41447a3ace4 Mon Sep 17 00:00:00 2001 From: bischoffz Date: Sat, 3 Feb 2024 21:22:39 -0500 Subject: [PATCH 3/3] remove mockito version prop --- gcm/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/gcm/pom.xml b/gcm/pom.xml index a8cdbf8bd..925aa91cb 100644 --- a/gcm/pom.xml +++ b/gcm/pom.xml @@ -60,7 +60,6 @@ 4.1.0-SNAPSHOT - 3.11.2 0.8.9 5.8.2