From def44b294fa00bb5470e977eef9a05e5087035f0 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Fri, 4 Feb 2022 10:34:28 +0000 Subject: Remove JPA annotations from apex-pdp code This review is part of a series of reviews to move the apex-pdp state machine model to use the base model types in policy models. Persistence of policies for apex-pdp is now implemented in PAP and API. The historic direct load and save functionality for APEX policy state machine models to and from databases is no longer used and no longer supported. This commit removes JPA annotations form apex-pdp code. Subsequent reviews will mvoe the mdoel across to use the policy models base model types. Issue-ID: POLICY-1820 Change-Id: I91a45a0ca6c88f9ba4b201bad920065f95ffb31e Signed-off-by: liamfallon --- model/basic-model/pom.xml | 6 +- .../model/basicmodel/concepts/AxArtifactKey.java | 7 +- .../apex/model/basicmodel/concepts/AxKeyInfo.java | 10 --- .../basicmodel/concepts/AxKeyInformation.java | 21 +----- .../apex/model/basicmodel/concepts/AxModel.java | 18 +----- .../model/basicmodel/concepts/AxReferenceKey.java | 9 +-- .../model/basicmodel/concepts/DummyEntity.java | 9 +-- .../contextmodel/concepts/AxContextAlbum.java | 19 +----- .../contextmodel/concepts/AxContextAlbums.java | 18 +----- .../contextmodel/concepts/AxContextModel.java | 18 +----- .../contextmodel/concepts/AxContextSchema.java | 10 --- .../contextmodel/concepts/AxContextSchemas.java | 21 +----- .../model/enginemodel/concepts/AxEngineModel.java | 19 +----- .../model/enginemodel/concepts/AxEngineStats.java | 20 +----- .../apex/model/eventmodel/concepts/AxEvent.java | 19 +----- .../model/eventmodel/concepts/AxEventModel.java | 18 +----- .../apex/model/eventmodel/concepts/AxEvents.java | 21 +----- .../apex/model/eventmodel/concepts/AxField.java | 22 +------ .../model/eventmodel/concepts/AxInputField.java | 9 +-- .../model/eventmodel/concepts/AxOutputField.java | 9 +-- .../apex/model/policymodel/concepts/AxLogic.java | 13 ---- .../model/policymodel/concepts/AxPolicies.java | 21 +----- .../apex/model/policymodel/concepts/AxPolicy.java | 20 +----- .../model/policymodel/concepts/AxPolicyModel.java | 27 +------- .../apex/model/policymodel/concepts/AxState.java | 75 +--------------------- .../concepts/AxStateFinalizerLogic.java | 19 ++---- .../model/policymodel/concepts/AxStateOutput.java | 31 +-------- .../policymodel/concepts/AxStateTaskReference.java | 23 +------ .../apex/model/policymodel/concepts/AxTask.java | 33 +--------- .../model/policymodel/concepts/AxTaskLogic.java | 19 ++---- .../policymodel/concepts/AxTaskParameter.java | 11 +--- .../policymodel/concepts/AxTaskSelectionLogic.java | 19 ++---- .../apex/model/policymodel/concepts/AxTasks.java | 21 +----- .../context/entities/ArtifactKeyTestEntity.java | 8 +-- .../context/entities/ReferenceKeyTestEntity.java | 8 +-- 35 files changed, 49 insertions(+), 602 deletions(-) diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml index a0b9f085d..4d7930298 100644 --- a/model/basic-model/pom.xml +++ b/model/basic-model/pom.xml @@ -1,6 +1,6 @@