Modify policy/distribution to use RestServer from common

This also entailed removing the local copy of RestServerParameters.
Also added an AafFilter, which was missing from the original code.

Change-Id: Ibbdce8c395e0149ab540a3704b3554a9d96b9705
Issue-ID: POLICY-1652
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
index 9b495866..f9cd868a 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
@@ -21,6 +21,7 @@
 
 package org.onap.policy.distribution.forwarding.xacml.pdp.engine;
 
+import static org.junit.Assert.assertSame;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
@@ -175,6 +176,8 @@ public class XacmlPdpPolicyForwarderTest {
         final ToscaPolicy policy = createPolicy(policies, "policy", "optimization");
         forwarder.forward(policies);
 
+        assertSame(policy, policies.iterator().next());
+
         verify(httpClientMock, times(0)).put(eq("createPolicy"), anyObject(), anyObject());
         verify(httpClientMock, times(0)).put(eq("pushPolicy"), anyObject(), anyObject());
     }