X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodel%2FPDPGroupContainer.java;h=c751c472beb608d065ad69ff3c3932a1c525fc69;hb=6f0d011428a916f7f84085e23876873fb0ad1f5d;hp=d5767b46aa64a34d4c262c211748ba1f9b1bdb3e;hpb=cac5ee759fee5db51a32838c7e25b878468a27e0;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
index d5767b46a..c751c472b 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/model/PDPGroupContainer.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -31,8 +31,8 @@ import java.util.Set;
 
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.utils.PolicyContainer;
-import org.onap.policy.utils.PolicyItemSetChangeNotifier;
+import org.onap.policy.rest.util.PolicyContainer;
+import org.onap.policy.rest.util.PolicyItemSetChangeNotifier;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.api.pap.OnapPDP;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
@@ -455,63 +455,4 @@ public class PDPGroupContainer extends PolicyItemSetChangeNotifier implements Po
 		}
 		return false;
 	}
-
-	public class PDPGroupItem{
-		private final OnapPDPGroup group;
-		
-		public PDPGroupItem(OnapPDPGroup itemId) {
-			this.group = itemId;
-		}
-
-		public String getId() {
-			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getId: " + this.group);
-			}
-			return this.group.getId();
-		}
-		
-		public String getName() {
-			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getName: " + this.group);
-			}
-			return this.group.getName();
-		}
-		
-		public String getDescription() {
-			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getDescription: " + this.group);
-			}
-			return this.group.getDescription();
-		}
-		
-		public Boolean getDefault() {
-			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getDefault: " + this.group);
-			}
-			return this.group.isDefaultGroup();
-		}
-		
-        
-        public String	getStatus() {
-			return this.group.getStatus().getStatus().toString();
-        }
-        
-        public Set<PDP>		getPDPs() {
-        	return Collections.unmodifiableSet(this.group.getPdps());
-        }
-        
-        public Set<PDPPolicy> getPolicies() {
- 			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getPolicies: " + this.group);
-			}
- 			return this.group.getPolicies();
-        }
-        
-        public Set<PDPPIPConfig> getPipConfigs() {
-			if (LOGGER.isTraceEnabled()) {
-				LOGGER.trace("getPIPConfigs: " + this.group);
-			}
-			return this.group.getPipConfigs();
-        }
-	}
 }