1 files changed, 48 insertions, 58 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java
index aca96ca..f0b9872 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java
@@ -24,73 +24,63 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 import org.apache.log4j.Logger;
-import org.onap.ransim.rest.api.controller.RansimControllerServices;
+import org.onap.ransim.rest.api.controller.RansimController;
 
 @Entity
 @Table(name = "CellNeighbor")
 public class CellNeighbor {
-    
-    @Id
-    @Column(name = "nodeId", unique = true, nullable = false, length = 52)
-    private String nodeId;
-    
-    /*
-     * @OneToMany(targetEntity = CellDetails.class) private Set<CellDetails>
-     * neighborList;
-     */
-    
-    @OneToMany(targetEntity = NeighborDetails.class)
-    private Set<NeighborDetails> neighborList;
-    
-    public CellNeighbor() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
-
-    public CellNeighbor(String nodeId, Set<NeighborDetails> neighborList) {
-        super();
-        this.nodeId = nodeId;
-        this.neighborList = neighborList;
-    }
-
-    public String getNodeId() {
-        return nodeId;
-    }
-    
-    public void setNodeId(String nodeId) {
-        this.nodeId = nodeId;
-    }
-    
-    public Set<NeighborDetails> getNeighborList() {
-        return neighborList;
-    }
-    
-    public void setNeighborList(Set<NeighborDetails> neighborList) {
-        this.neighborList = neighborList;
-    }
-    
-    static Logger log = Logger.getLogger(RansimControllerServices.class.getName());
-    
-    public void display() {
-        
-        List<NeighborDetails> iterator = new ArrayList<>(neighborList);
-        for (int ii = 0; ii < iterator.size(); ii++) {
-            log.info("neighbors NeighborList: "
-                    + iterator.get(ii).getNeigbor().getSourceCellNodeId() + " "
-                    + iterator.get(ii).getNeigbor().getNeighborCell() + " "
-                    + iterator.get(ii).isBlacklisted());
-        }
-        
-    }
-    /*
-     * public void clearNeighborList() { this.neighborList.; }
-     */
-    
+
+	@Id
+	@Column(name = "nodeId", unique = true, nullable = false, length = 52)
+	private String nodeId;
+
+	@OneToMany(targetEntity = NeighborDetails.class,fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	private Set<NeighborDetails> neighborList;
+
+	public CellNeighbor() {
+		super();
+	}
+
+	public CellNeighbor(String nodeId, Set<NeighborDetails> neighborList) {
+		super();
+		this.nodeId = nodeId;
+		this.neighborList = neighborList;
+	}
+
+	public String getNodeId() {
+		return nodeId;
+	}
+
+	public void setNodeId(String nodeId) {
+		this.nodeId = nodeId;
+	}
+
+	public Set<NeighborDetails> getNeighborList() {
+		return neighborList;
+	}
+
+	public void setNeighborList(Set<NeighborDetails> neighborList) {
+		this.neighborList = neighborList;
+	}
+
+	static Logger log = Logger.getLogger(RansimController.class.getName());
+
+	public void display() {
+
+		List<NeighborDetails> iterator = new ArrayList<>(neighborList);
+		for (int ii = 0; ii < iterator.size(); ii++) {
+			log.info("neighbors NeighborList: " + iterator.get(ii).getNeigbor().getSourceCellNodeId() + " "
+					+ iterator.get(ii).getNeigbor().getNeighborCell() + " " + iterator.get(ii).isBlacklisted());
+		}
+
+	}
 }