Remove old implementation of statistics in ACM models

The old implementation of statistics in ACM
can be removed due the Prometheus metrics support.

Issue-ID: POLICY-4422
Change-Id: Ia2681b9a3ca59d532cd5c0d1ce4edd3e8f9f98e3
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

15 files changed, 5 insertions, 1030 deletions

diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatistics.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatistics.java
deleted file mode 100644
index d1b1e31e8..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatistics.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.concepts;
-
-import java.io.Serializable;
-import java.time.Instant;
-import java.util.UUID;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.ToString;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-@NoArgsConstructor
-@Data
-@ToString
-public class AcElementStatistics implements Serializable {
-
-    private static final long serialVersionUID = 3284285693112271055L;
-
-    @NonNull
-    private UUID id = UUID.randomUUID();
-
-    @NonNull
-    private ToscaConceptIdentifier participantId;
-
-    @NonNull
-    private Instant timeStamp;
-
-    @NonNull
-    private AutomationCompositionState state;
-
-    private long acElementUptime;
-
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsList.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsList.java
deleted file mode 100644
index 3b8feb5f6..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementStatisticsList.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.concepts;
-
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-public class AcElementStatisticsList {
-    private List<AcElementStatistics> acElementStatistics;
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java
index f6134782b..4736d3190 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationComposition.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@
 
 package org.onap.policy.clamp.models.acm.concepts;
 
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -98,20 +96,4 @@ public class AutomationComposition extends ToscaEntity implements Comparable<Aut
 
         elements.values().forEach(element -> element.setOrderedState(orderedState));
     }
-
-    /**
-     * Get a list of automation composition element statistics.
-     *
-     * @param automationComposition the automation composition
-     * @return List of AcElementStatistics
-     */
-    public List<AcElementStatistics> getAutomationCompositionElementStatisticsList(
-        final AutomationComposition automationComposition) {
-        if (MapUtils.isEmpty(automationComposition.elements)) {
-            return List.of();
-        }
-
-        return automationComposition.elements.values().stream()
-            .map(AutomationCompositionElement::getAcElementStatistics).collect(Collectors.toList());
-    }
 }
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java
index 046b77f76..7033abac2 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,8 +63,6 @@ public class AutomationCompositionElement {
 
     private String description;
 
-    private AcElementStatistics acElementStatistics;
-
     // A map indexed by the property name. Each map entry is the serialized value of the property,
     // which can be deserialized into an instance of the type of the property.
     private Map<String, ToscaProperty> propertiesMap = new LinkedHashMap<>();
@@ -83,7 +81,6 @@ public class AutomationCompositionElement {
         this.orderedState = otherElement.orderedState;
         this.toscaServiceTemplateFragment = otherElement.toscaServiceTemplateFragment;
         this.description = otherElement.description;
-        this.acElementStatistics = otherElement.acElementStatistics;
         this.propertiesMap = PfUtils.mapMap(otherElement.propertiesMap, UnaryOperator.identity());
     }
 }
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java
index dba8f553c..14aee1dd8 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionInfo.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,6 @@ public class AutomationCompositionInfo {
 
     private AutomationCompositionState state = AutomationCompositionState.UNINITIALISED;
 
-    private AutomationCompositionStatistics automationCompositionStatistics;
-
     /**
      * Copy constructor, does a deep copy but as all fields here are immutable, it's just a regular copy.
      *
@@ -47,6 +45,5 @@ public class AutomationCompositionInfo {
     public AutomationCompositionInfo(final AutomationCompositionInfo otherElement) {
         this.automationCompositionId = otherElement.automationCompositionId;
         this.state = otherElement.state;
-        this.automationCompositionStatistics = otherElement.automationCompositionStatistics;
     }
 }
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionStatistics.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionStatistics.java
deleted file mode 100644
index 8f73328ad..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionStatistics.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.concepts;
-
-import java.time.Instant;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.ToString;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-@NoArgsConstructor
-@Data
-@ToString
-public class AutomationCompositionStatistics {
-
-    @NonNull
-    private ToscaConceptIdentifier automationCompositionId;
-
-    @NonNull
-    private Instant timeStamp;
-
-    @NonNull
-    private AcElementStatisticsList acElementStatisticsList;
-
-    private long eventCount;
-    private long lastExecutionTime;
-    private double averageExecutionTime;
-    private long upTime;
-    private long lastEnterTime;
-    private long lastStart;
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatistics.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatistics.java
deleted file mode 100644
index 4d3b96db7..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatistics.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.concepts;
-
-import java.io.Serializable;
-import java.time.Instant;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.ToString;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-@NoArgsConstructor
-@Data
-@ToString
-public class ParticipantStatistics implements Serializable {
-    private static final long serialVersionUID = 744036598792333124L;
-
-
-    @NonNull
-    private ToscaConceptIdentifier participantId;
-
-    @NonNull
-    private Instant timeStamp;
-
-    private ParticipantState state;
-    private ParticipantHealthStatus healthStatus;
-    private long eventCount;
-    private long lastExecutionTime;
-    private double averageExecutionTime;
-    private long upTime;
-    private long lastEnterTime;
-    private long lastStart;
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsList.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsList.java
deleted file mode 100644
index 4abdf4a63..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/ParticipantStatisticsList.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.concepts;
-
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-public class ParticipantStatisticsList {
-    private List<ParticipantStatistics> statisticsList;
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatus.java b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatus.java
index 32b95e11b..1d57c24e8 100644
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatus.java
+++ b/models/src/main/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantStatus.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionInfo;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantHealthStatus;
 import org.onap.policy.clamp.models.acm.concepts.ParticipantState;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantStatistics;
 import org.onap.policy.models.base.PfUtils;
 
 /**
@@ -44,12 +43,10 @@ public class ParticipantStatus extends ParticipantMessage {
     private ParticipantState state;
     private ParticipantHealthStatus healthStatus;
 
-    private ParticipantStatistics participantStatistics;
-
     // A list of ParticipantDefinition updates, returned in response to ParticipantStatusReq only
     private List<ParticipantDefinition> participantDefinitionUpdates = new ArrayList<>();
 
-    // List of AutomationCompositionInfo types with AutomationCompositionId, its state and statistics
+    // List of AutomationCompositionInfo types with AutomationCompositionId and its state
     private List<AutomationCompositionInfo> automationCompositionInfoList = new ArrayList<>();
 
     /**
@@ -70,7 +67,6 @@ public class ParticipantStatus extends ParticipantMessage {
 
         this.state = source.state;
         this.healthStatus = source.healthStatus;
-        this.participantStatistics = (source.participantStatistics == null ? null : new ParticipantStatistics());
         this.participantDefinitionUpdates =
             PfUtils.mapList(source.participantDefinitionUpdates, ParticipantDefinition::new);
         this.automationCompositionInfoList =
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatistics.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatistics.java
deleted file mode 100644
index 4a046052e..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAcElementStatistics.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.persistence.concepts;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.UUID;
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NonNull;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.clamp.models.acm.concepts.AcElementStatistics;
-import org.onap.policy.clamp.models.acm.concepts.AutomationCompositionState;
-import org.onap.policy.common.parameters.annotations.NotNull;
-import org.onap.policy.models.base.PfAuthorative;
-import org.onap.policy.models.base.PfConcept;
-import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfKey;
-import org.onap.policy.models.base.PfReferenceTimestampKey;
-import org.onap.policy.models.base.validation.annotations.VerifyKey;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-/**
- * Class to represent automation composition element statistics in the database.
- *
- * @author Ramesh Murugan Iyer (ramesh.murugan.iyer@est.tech)
- */
-@Entity
-@Table(name = "AcElementStatistics")
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@Data
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class JpaAcElementStatistics extends PfConcept implements PfAuthorative<AcElementStatistics>, Serializable {
-
-    private static final long serialVersionUID = 621426717868738629L;
-
-    @EmbeddedId
-    @VerifyKey
-    @NotNull
-    private PfReferenceTimestampKey key = new PfReferenceTimestampKey();
-
-
-    @VerifyKey
-    @NotNull
-    // @formatter:off
-    @AttributeOverride(name = "name",    column = @Column(name = "participant_name"))
-    @AttributeOverride(name = "version", column = @Column(name = "participant_version"))
-    private PfConceptKey participantId;
-    // @formatter: on
-
-    @Column
-    @NotNull
-    private AutomationCompositionState state;
-
-    @Column
-    private long acElementUptime;
-
-
-    /**
-     * The Default Constructor creates a {@link JpaAcElementStatistics} object with a null key.
-     */
-    public JpaAcElementStatistics() {
-        this(new PfReferenceTimestampKey());
-    }
-
-
-    /**
-     * The Key Constructor creates a {@link JpaAcElementStatistics} object with the given Reference Timestamp key.
-     *
-     * @param key the key
-     */
-    public JpaAcElementStatistics(@NonNull final PfReferenceTimestampKey key) {
-        this(key, new PfConceptKey(), AutomationCompositionState.PASSIVE, 0L);
-    }
-
-    /**
-     * The Key Constructor creates a {@link JpaAcElementStatistics} object with all mandatory fields.
-     *
-     * @param key the key
-     * @param participantId the TOSCA definition of the automation composition element
-     */
-    public JpaAcElementStatistics(@NonNull final PfReferenceTimestampKey key,
-                                  @NonNull final PfConceptKey participantId) {
-        this.key = key;
-        this.participantId = participantId;
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param copyConcept the concept to copy from
-     */
-    public JpaAcElementStatistics(@NonNull final JpaAcElementStatistics copyConcept) {
-        super(copyConcept);
-        this.key = new PfReferenceTimestampKey(copyConcept.key);
-        this.participantId = new PfConceptKey(copyConcept.participantId);
-        this.state = copyConcept.state;
-        this.acElementUptime = copyConcept.acElementUptime;
-    }
-
-
-    /**
-     * Authorative constructor.
-     *
-     * @param authorativeConcept the authorative concept to copy from
-     */
-    public JpaAcElementStatistics(@NonNull final AcElementStatistics authorativeConcept) {
-        this.fromAuthorative(authorativeConcept);
-    }
-
-
-
-    @Override
-    public AcElementStatistics toAuthorative() {
-        var acElementStatistics = new AcElementStatistics();
-        acElementStatistics.setId(UUID.fromString(getKey().getReferenceKey().getLocalName()));
-        acElementStatistics.setTimeStamp(key.getInstant());
-        acElementStatistics.setParticipantId(new ToscaConceptIdentifier(participantId));
-        acElementStatistics.setState(state);
-        acElementStatistics.setAcElementUptime(acElementUptime);
-
-        return acElementStatistics;
-    }
-
-    @Override
-    public void fromAuthorative(@NonNull AcElementStatistics acElementStatistics) {
-        // @formatter:off
-        if (this.key == null || this.getKey().isNullKey()) {
-            this.setKey(new PfReferenceTimestampKey(acElementStatistics.getParticipantId().getName(),
-                acElementStatistics.getParticipantId().getVersion(), acElementStatistics.getId().toString(),
-                acElementStatistics.getTimeStamp()));
-        }
-        // @formatter:on
-        this.setParticipantId(acElementStatistics.getParticipantId().asConceptKey());
-        this.setState(acElementStatistics.getState());
-        this.setAcElementUptime(acElementStatistics.getAcElementUptime());
-    }
-
-    @Override
-    public List<PfKey> getKeys() {
-        return getKey().getKeys();
-    }
-
-    @Override
-    public void clean() {
-        key.clean();
-        participantId.clean();
-    }
-
-
-    @Override
-    public int compareTo(PfConcept otherConcept) {
-        if (otherConcept == null) {
-            return -1;
-        }
-        if (this == otherConcept) {
-            return 0;
-        }
-        if (getClass() != otherConcept.getClass()) {
-            return getClass().getName().compareTo(otherConcept.getClass().getName());
-        }
-
-        final JpaAcElementStatistics other = (JpaAcElementStatistics) otherConcept;
-        return new CompareToBuilder().append(this.key, other.key).append(this.state, other.state)
-                .append(this.acElementUptime, other.acElementUptime).toComparison();
-    }
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatistics.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatistics.java
deleted file mode 100644
index a076433bb..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaParticipantStatistics.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-
-package org.onap.policy.clamp.models.acm.persistence.concepts;
-
-import java.io.Serializable;
-import java.util.List;
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NonNull;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantHealthStatus;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantState;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantStatistics;
-import org.onap.policy.common.parameters.annotations.NotNull;
-import org.onap.policy.models.base.PfAuthorative;
-import org.onap.policy.models.base.PfConcept;
-import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfKey;
-import org.onap.policy.models.base.PfTimestampKey;
-import org.onap.policy.models.base.validation.annotations.VerifyKey;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-/**
- * Class to represent a participant statistics in the database.
- *
- * @author Ramesh Murugan Iyer (ramesh.murugan.iyer@est.tech)
- */
-@Entity
-@Table(name = "ParticipantStatistics")
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@Data
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class JpaParticipantStatistics extends PfConcept implements PfAuthorative<ParticipantStatistics>, Serializable {
-
-    private static final long serialVersionUID = -5992214428190133190L;
-
-    @EmbeddedId
-    @VerifyKey
-    @NotNull
-    private PfTimestampKey key;
-
-    @VerifyKey
-    @NotNull
-    @AttributeOverride(name = "name", column = @Column(name = "participant_name"))
-    @AttributeOverride(name = "version", column = @Column(name = "participant_version"))
-    private PfConceptKey participantId;
-
-    @Column
-    @NotNull
-    private ParticipantState state;
-
-    @Column
-    @NotNull
-    private ParticipantHealthStatus healthStatus;
-
-    @Column
-    private long eventCount;
-
-    @Column
-    private long lastExecutionTime;
-
-    @Column
-    private double averageExecutionTime;
-
-    @Column
-    private long upTime;
-
-    @Column
-    private long lastEnterTime;
-
-    @Column
-    private long lastStart;
-
-
-    /**
-     * The Default Constructor creates a {@link JpaParticipantStatistics} object with a null key.
-     */
-    public JpaParticipantStatistics() {
-        this(new PfTimestampKey());
-    }
-
-    /**
-     * The Key Constructor creates a {@link JpaParticipantStatistics} object with the given Timestamp key.
-     *
-     * @param key the key
-     */
-    public JpaParticipantStatistics(@NonNull final PfTimestampKey key) {
-        this(key, new PfConceptKey(), ParticipantState.PASSIVE, ParticipantHealthStatus.HEALTHY, 0L, 0L, 0.0d, 0L, 0L,
-                0L);
-    }
-
-
-    /**
-     * The Key Constructor creates a {@link JpaParticipantStatistics} object with all mandatory fields.
-     *
-     * @param key the key
-     * @param participantId the TOSCA definition of the participant
-     */
-    public JpaParticipantStatistics(@NonNull final PfTimestampKey key, @NonNull final PfConceptKey participantId) {
-        this.key = key;
-        this.participantId = participantId;
-    }
-
-
-    /**
-     * Copy constructor.
-     *
-     * @param copyConcept the concept to copy from
-     */
-    public JpaParticipantStatistics(@NonNull final JpaParticipantStatistics copyConcept) {
-        super(copyConcept);
-        this.key = new PfTimestampKey(copyConcept.key);
-        this.participantId = new PfConceptKey(copyConcept.participantId);
-        this.state = copyConcept.state;
-        this.healthStatus = copyConcept.healthStatus;
-        this.eventCount = copyConcept.eventCount;
-        this.lastExecutionTime = copyConcept.lastExecutionTime;
-        this.averageExecutionTime = copyConcept.averageExecutionTime;
-        this.upTime = copyConcept.upTime;
-        this.lastEnterTime = copyConcept.lastEnterTime;
-        this.lastStart = copyConcept.lastStart;
-    }
-
-    /**
-     * Authorative constructor.
-     *
-     * @param authorativeConcept the authorative concept to copy from
-     */
-    public JpaParticipantStatistics(@NonNull final ParticipantStatistics authorativeConcept) {
-        this.fromAuthorative(authorativeConcept);
-    }
-
-
-    @Override
-    public int compareTo(PfConcept otherConcept) {
-        if (otherConcept == null) {
-            return -1;
-        }
-        if (this == otherConcept) {
-            return 0;
-        }
-        if (getClass() != otherConcept.getClass()) {
-            return getClass().getName().compareTo(otherConcept.getClass().getName());
-        }
-
-        final JpaParticipantStatistics other = (JpaParticipantStatistics) otherConcept;
-        // @formatter:off
-        return new CompareToBuilder()
-                .append(this.key, other.key)
-                .append(this.participantId, other.participantId)
-                .append(this.state, other.state)
-                .append(this.healthStatus, other.healthStatus)
-                .append(this.eventCount, other.eventCount)
-                .append(this.lastExecutionTime, other.lastExecutionTime)
-                .append(this.averageExecutionTime, other.averageExecutionTime)
-                .append(this.upTime, other.upTime)
-                .append(this.lastEnterTime, other.lastEnterTime)
-                .append(this.lastStart, other.lastStart).toComparison();
-        // @formatter:on
-    }
-
-    @Override
-    public ParticipantStatistics toAuthorative() {
-        var participantStatistics = new ParticipantStatistics();
-        participantStatistics.setTimeStamp(key.getTimeStamp().toInstant());
-        participantStatistics.setParticipantId(new ToscaConceptIdentifier(participantId));
-        participantStatistics.setState(state);
-        participantStatistics.setHealthStatus(healthStatus);
-        participantStatistics.setAverageExecutionTime(averageExecutionTime);
-        participantStatistics.setEventCount(eventCount);
-        participantStatistics.setLastExecutionTime(lastExecutionTime);
-        participantStatistics.setUpTime(upTime);
-        participantStatistics.setLastEnterTime(lastEnterTime);
-        participantStatistics.setLastStart(lastStart);
-
-        return participantStatistics;
-    }
-
-    @Override
-    public void fromAuthorative(@NonNull final ParticipantStatistics participantStatistics) {
-        if (this.key == null || this.getKey().isNullKey()) {
-            this.setKey(new PfTimestampKey(participantStatistics.getParticipantId().getName(),
-                    participantStatistics.getParticipantId().getVersion(), participantStatistics.getTimeStamp()));
-        }
-        this.setParticipantId(participantStatistics.getParticipantId().asConceptKey());
-        this.setState(participantStatistics.getState());
-        this.setHealthStatus(participantStatistics.getHealthStatus());
-        this.setAverageExecutionTime(participantStatistics.getAverageExecutionTime());
-        this.setEventCount(participantStatistics.getEventCount());
-        this.setLastExecutionTime(participantStatistics.getLastExecutionTime());
-        this.setUpTime(participantStatistics.getUpTime());
-        this.setLastEnterTime(participantStatistics.getLastEnterTime());
-        this.setLastStart(participantStatistics.getLastStart());
-
-    }
-
-    @Override
-    public List<PfKey> getKeys() {
-        List<PfKey> keyList = getKey().getKeys();
-        keyList.addAll(participantId.getKeys());
-        return keyList;
-    }
-
-    @Override
-    public void clean() {
-        key.clean();
-        participantId.clean();
-    }
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProvider.java
deleted file mode 100644
index 59ddcc2ea..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AcElementStatisticsProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.persistence.provider;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
-import org.onap.policy.clamp.models.acm.concepts.AcElementStatistics;
-import org.onap.policy.clamp.models.acm.persistence.concepts.JpaAcElementStatistics;
-import org.onap.policy.clamp.models.acm.persistence.repository.AcElementStatisticsRepository;
-import org.onap.policy.models.base.PfModelException;
-import org.onap.policy.models.base.PfReferenceTimestampKey;
-import org.onap.policy.models.dao.PfFilterParameters;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * This class provides the provision of information on automation composition element statistics in the database to
- * callers.
- *
- * @author Ramesh Murugan Iyer (ramesh.murugan.iyer@est.tech)
- */
-@Service
-@Transactional
-@AllArgsConstructor
-public class AcElementStatisticsProvider {
-
-    private AcElementStatisticsRepository acElementStatisticsRepository;
-
-    /**
-     * Creates automation composition element statistics.
-     *
-     * @param acElementStatisticsList a specification of the statistics to create
-     * @return the Element statistics created
-     * @throws PfModelException on initiation errors
-     */
-    public List<AcElementStatistics> createAcElementStatistics(
-        @NonNull final List<AcElementStatistics> acElementStatisticsList) throws PfModelException {
-
-        try {
-            var jpaAcElementStatisticsList = ProviderUtils.getJpaAndValidateList(acElementStatisticsList,
-                JpaAcElementStatistics::new, "automation composition element statistics");
-
-            var jpaAcElementStatisticsSaved = acElementStatisticsRepository.saveAll(jpaAcElementStatisticsList);
-
-            // Return the saved automation composition element statistics
-            return asAcElementStatisticsList(jpaAcElementStatisticsSaved);
-        } catch (IllegalArgumentException e) {
-            throw new PfModelException(Status.BAD_REQUEST, "Error in save automation composition element statistics",
-                e);
-        }
-    }
-
-    /**
-     * Convert JPA acElement statistics list to acElement statistics list.
-     *
-     * @param jpaAcElementStatistics the list to convert
-     * @return the acElement statistics list
-     */
-    private List<AcElementStatistics> asAcElementStatisticsList(List<JpaAcElementStatistics> jpaAcElementStatistics) {
-        return jpaAcElementStatistics.stream().map(JpaAcElementStatistics::toAuthorative).collect(Collectors.toList());
-    }
-
-    /**
-     * Get acElement statistics.
-     *
-     * @param name the name of the participant
-     * @param version version of the participant
-     * @param id of the automation composition element
-     * @param timestamp timestamp of the statistics
-     * @return the acElement statistics found
-     */
-    @Transactional(readOnly = true)
-    public List<AcElementStatistics> getAcElementStatistics(final String name, final String version, final String id,
-        final Instant timestamp) {
-        if (name != null && version != null && timestamp != null && id != null) {
-            return asAcElementStatisticsList(acElementStatisticsRepository
-                .findAllById(List.of(new PfReferenceTimestampKey(name, version, id, timestamp))));
-        } else if (name != null) {
-            return getFilteredAcElementStatistics(name, version, null, null, null, "DESC", 0);
-        }
-        return asAcElementStatisticsList(acElementStatisticsRepository.findAll());
-    }
-
-    /**
-     * Get filtered acElement statistics.
-     *
-     * @param name the acElement name for the statistics to get
-     * @param version the acElement version for the statistics to get
-     * @param startTimeStamp startTimeStamp to filter statistics
-     * @param endTimeStamp endTimeStamp to filter statistics
-     * @param sortOrder sortOrder to query database
-     * @param getRecordNum Total query count from database
-     * @param filterMap the filters to apply to the get operation
-     * @return the acElement statistics found
-     */
-    @Transactional(readOnly = true)
-    public List<AcElementStatistics> getFilteredAcElementStatistics(final String name, final String version,
-        final Instant startTimeStamp, final Instant endTimeStamp, Map<String, Object> filterMap, final String sortOrder,
-        final int getRecordNum) {
-
-        // @formatter:off
-        PfFilterParameters filterParams = PfFilterParameters
-                .builder()
-                .name(name)
-                .version(version)
-                .startTime(startTimeStamp)
-                .endTime(endTimeStamp)
-                .filterMap(filterMap)
-                .sortOrder(sortOrder)
-                .recordNum(getRecordNum)
-                .build();
-        // @formatter:on
-        return asAcElementStatisticsList(
-            acElementStatisticsRepository.getFiltered(JpaAcElementStatistics.class, filterParams));
-    }
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProvider.java
deleted file mode 100644
index a5a0ce176..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/ParticipantStatisticsProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.persistence.provider;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
-import org.onap.policy.clamp.models.acm.concepts.ParticipantStatistics;
-import org.onap.policy.clamp.models.acm.persistence.concepts.JpaParticipantStatistics;
-import org.onap.policy.clamp.models.acm.persistence.repository.ParticipantStatisticsRepository;
-import org.onap.policy.models.base.PfModelException;
-import org.onap.policy.models.base.PfTimestampKey;
-import org.onap.policy.models.dao.PfFilterParameters;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * This class provides the provision of information on participant statistics in the database to callers.
- */
-@Service
-@Transactional
-@AllArgsConstructor
-public class ParticipantStatisticsProvider {
-
-    private ParticipantStatisticsRepository participantStatisticsRepository;
-
-    /**
-     * Get Participant statistics.
-     *
-     * @param name the name of the participant statistics to get, null to get all stats
-     * @param version the version of the participant statistics to get, null to get all stats for a name
-     * @param timestamp the time stamp for the stats to get
-     * @return the participant statistics found
-     */
-    @Transactional(readOnly = true)
-    public List<ParticipantStatistics> getParticipantStatistics(final String name, final String version,
-            final Instant timestamp) {
-        if (name != null && version != null && timestamp != null) {
-            return asParticipantStatisticsList(
-                    participantStatisticsRepository.findAllById(List.of(new PfTimestampKey(name, version, timestamp))));
-        } else if (name != null) {
-            return getFilteredParticipantStatistics(name, version, timestamp, null, null, "DESC", 0);
-        }
-        return asParticipantStatisticsList(participantStatisticsRepository.findAll());
-    }
-
-    /**
-     * Get filtered participant statistics.
-     *
-     * @param name the participant name for the statistics to get
-     * @param version the participant version for the statistics to get
-     * @param startTimeStamp startTimeStamp to filter statistics
-     * @param endTimeStamp endTimeStamp to filter statistics
-     * @param sortOrder sortOrder to query database
-     * @param getRecordNum Total query count from database
-     * @param filterMap the filters to apply to the get operation
-     * @return the participant statistics found
-     */
-    @Transactional(readOnly = true)
-    public List<ParticipantStatistics> getFilteredParticipantStatistics(final String name, final String version,
-            final Instant startTimeStamp, final Instant endTimeStamp, Map<String, Object> filterMap,
-            final String sortOrder, final int getRecordNum) {
-
-        // @formatter:off
-        PfFilterParameters filterParams = PfFilterParameters
-                .builder()
-                .name(name)
-                .version(version)
-                .startTime(startTimeStamp)
-                .endTime(endTimeStamp)
-                .filterMap(filterMap)
-                .sortOrder(sortOrder)
-                .recordNum(getRecordNum)
-                .build();
-        // @formatter:on
-
-        return asParticipantStatisticsList(
-                participantStatisticsRepository.getFiltered(JpaParticipantStatistics.class, filterParams));
-    }
-
-    /**
-     * Creates Participant statistics.
-     *
-     * @param participantStatisticsList a specification of the statistics to create
-     * @return the participant statistics created
-     * @throws PfModelException on errors creating participant statistics
-     */
-    public List<ParticipantStatistics> createParticipantStatistics(
-            @NonNull final List<ParticipantStatistics> participantStatisticsList) throws PfModelException {
-
-        try {
-            var jpaParticipantStatisticsList = ProviderUtils.getJpaAndValidateList(participantStatisticsList,
-                    JpaParticipantStatistics::new, "Participant Statistics");
-
-            var jpaParticipantStatisticsSaved = participantStatisticsRepository.saveAll(jpaParticipantStatisticsList);
-
-            // Return the saved participant statistics
-            return asParticipantStatisticsList(jpaParticipantStatisticsSaved);
-        } catch (IllegalArgumentException e) {
-            throw new PfModelException(Status.BAD_REQUEST, "Error in save participant statistics", e);
-        }
-    }
-
-    /**
-     * Convert JPA participant statistics list to participant statistics list.
-     *
-     * @param jpaParticipantStatisticsList the list to convert
-     * @return the participant statistics list
-     */
-    private List<ParticipantStatistics> asParticipantStatisticsList(
-            List<JpaParticipantStatistics> jpaParticipantStatisticsList) {
-
-        return jpaParticipantStatisticsList.stream().map(JpaParticipantStatistics::toAuthorative)
-                .collect(Collectors.toList());
-    }
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/AcElementStatisticsRepository.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/AcElementStatisticsRepository.java
deleted file mode 100644
index 13001114f..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/AcElementStatisticsRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.persistence.repository;
-
-import org.onap.policy.clamp.models.acm.persistence.concepts.JpaAcElementStatistics;
-import org.onap.policy.models.base.PfReferenceTimestampKey;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AcElementStatisticsRepository
-        extends JpaRepository<JpaAcElementStatistics, PfReferenceTimestampKey>, FilterRepository {
-
-}
diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/ParticipantStatisticsRepository.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/ParticipantStatisticsRepository.java
deleted file mode 100644
index 9cba62a70..000000000
--- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/repository/ParticipantStatisticsRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.models.acm.persistence.repository;
-
-import org.onap.policy.clamp.models.acm.persistence.concepts.JpaParticipantStatistics;
-import org.onap.policy.models.base.PfTimestampKey;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ParticipantStatisticsRepository
-        extends JpaRepository<JpaParticipantStatistics, PfTimestampKey>, FilterRepository {
-
-}