1 files changed, 1 insertions, 20 deletions
diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
index ea4ec57a4..26275a157 100644
--- a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
+++ b/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2020,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.
@@ -27,13 +27,6 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
-import javax.persistence.CascadeType;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -59,9 +52,6 @@ import org.onap.policy.common.utils.validation.Assertions;
  * container. Each event entry is checked to ensure that its key and value are not null and that the key matches the key
  * in the map value. Each event entry is then validated individually.
  */
-@Entity
-@Table(name = "AxEvents")
-
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AxEvents", namespace = "http://www.onap.org/policy/apex-pdp", propOrder =
     { "key", "eventMap" })
@@ -69,20 +59,11 @@ import org.onap.policy.common.utils.validation.Assertions;
 public class AxEvents extends AxConcept implements AxConceptGetter<AxEvent> {
     private static final long serialVersionUID = 4290442590545820316L;
 
-    @EmbeddedId
     @XmlElement(name = "key", required = true)
     private AxArtifactKey key;
 
-    // @formatter:off
-    @ManyToMany(cascade = CascadeType.ALL)
-    @JoinTable(
-            joinColumns = { @JoinColumn(name = "eventMapName", referencedColumnName = "name"),
-                @JoinColumn(name = "eventMapVersion", referencedColumnName = "version") },
-            inverseJoinColumns = { @JoinColumn(name = "eventName", referencedColumnName = "name"),
-                @JoinColumn(name = "eventVersion", referencedColumnName = "version") })
     @XmlElement(required = true)
     private Map<AxArtifactKey, AxEvent> eventMap;
-    // @formatter:on
 
     /**
      * The Default Constructor creates a {@link AxEvents} object with a null artifact key and creates an empty event