Merge "Update IidFactoryTest to use non-deprecated function"

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/util/IidFactoryTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/util/IidFactoryTest.java
index a64f0e4b1241c3b1ce85ec801f4603ea198e1bfa..b3604cc720bfdc6efcd0643f2ba460fe72b0e496 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/util/IidFactoryTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/util/IidFactoryTest.java
@@ -36,21 +36,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.EndpointL3Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.has.classifier.refs.ClassifierRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.Tenant;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.TenantKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.Contract;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.ContractKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.EndpointGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.EndpointGroupKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L2BridgeDomain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L2FloodDomain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L3Context;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.Subnet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.SubnetKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.Clause;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.Subject;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.SubjectKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.subject.Rule;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.subject.RuleKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.endpoint.group.ConsumerNamedSelector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.endpoint.group.ProviderNamedSelector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.subject.feature.instances.ActionInstance;
@@ -84,14 +78,14 @@ public class IidFactoryTest {
     public void endpointGroupIidTest() {
         InstanceIdentifier<EndpointGroup> identifier = IidFactory.endpointGroupIid(tenantId, epgId);
         Assert.assertEquals(epgId, InstanceIdentifier.keyOf(identifier).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
     public void contractIidTest() {
         InstanceIdentifier<Contract> identifier = IidFactory.contractIid(tenantId, contractId);
         Assert.assertEquals(contractId, InstanceIdentifier.keyOf(identifier).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -99,8 +93,8 @@ public class IidFactoryTest {
         SubjectName subjectName = mock(SubjectName.class);
         InstanceIdentifier<Subject> identifier = IidFactory.subjectIid(tenantId, contractId, subjectName);
         Assert.assertEquals(subjectName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class, ContractKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -109,8 +103,8 @@ public class IidFactoryTest {
         InstanceIdentifier<ProviderNamedSelector> identifier = IidFactory.providerNamedSelectorIid(tenantId, epgId,
                 providerSelectorName);
         Assert.assertEquals(providerSelectorName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(epgId, identifier.firstKeyOf(EndpointGroup.class, EndpointGroupKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(epgId, identifier.firstKeyOf(EndpointGroup.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -119,8 +113,8 @@ public class IidFactoryTest {
         InstanceIdentifier<ConsumerNamedSelector> identifier = IidFactory.consumerNamedSelectorIid(tenantId, epgId,
                 consumerSelectorName);
         Assert.assertEquals(consumerSelectorName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(epgId, identifier.firstKeyOf(EndpointGroup.class, EndpointGroupKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(epgId, identifier.firstKeyOf(EndpointGroup.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -128,17 +122,17 @@ public class IidFactoryTest {
         ClauseName clauseName = mock(ClauseName.class);
         InstanceIdentifier<Clause> identifier = IidFactory.clauseIid(tenantId, contractId, clauseName);
         Assert.assertEquals(clauseName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class, ContractKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
     public void ruleIdTest() {
         InstanceIdentifier<Rule> identifier = IidFactory.ruleIid(tenantId, contractId, subjectName, ruleName);
         Assert.assertEquals(ruleName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(subjectName, identifier.firstKeyOf(Subject.class, SubjectKey.class).getName());
-        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class, ContractKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(subjectName, identifier.firstKeyOf(Subject.class).getName());
+        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -146,7 +140,7 @@ public class IidFactoryTest {
         ActionName actionName = mock(ActionName.class);
         InstanceIdentifier<ActionInstance> identifier = IidFactory.actionInstanceIid(tenantId, actionName);
         Assert.assertEquals(actionName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -154,7 +148,7 @@ public class IidFactoryTest {
         ClassifierName classifierName = mock(ClassifierName.class);
         InstanceIdentifier<ClassifierInstance> identifier = IidFactory.classifierInstanceIid(tenantId, classifierName);
         Assert.assertEquals(classifierName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -163,10 +157,10 @@ public class IidFactoryTest {
         InstanceIdentifier<ClassifierRef> identifier = IidFactory.classifierRefIid(tenantId, contractId, subjectName,
                 ruleName, classifierRefName);
         Assert.assertEquals(classifierRefName, InstanceIdentifier.keyOf(identifier).getName());
-        Assert.assertEquals(ruleName, identifier.firstKeyOf(Rule.class, RuleKey.class).getName());
-        Assert.assertEquals(subjectName, identifier.firstKeyOf(Subject.class, SubjectKey.class).getName());
-        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class, ContractKey.class).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(ruleName, identifier.firstKeyOf(Rule.class).getName());
+        Assert.assertEquals(subjectName, identifier.firstKeyOf(Subject.class).getName());
+        Assert.assertEquals(contractId, identifier.firstKeyOf(Contract.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -174,7 +168,7 @@ public class IidFactoryTest {
         L2FloodDomainId l2FloodDomainId = mock(L2FloodDomainId.class);
         InstanceIdentifier<L2FloodDomain> identifier = IidFactory.l2FloodDomainIid(tenantId, l2FloodDomainId);
         Assert.assertEquals(l2FloodDomainId, InstanceIdentifier.keyOf(identifier).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -182,7 +176,7 @@ public class IidFactoryTest {
         L2BridgeDomainId l2BridgeDomainId = mock(L2BridgeDomainId.class);
         InstanceIdentifier<L2BridgeDomain> identifier = IidFactory.l2BridgeDomainIid(tenantId, l2BridgeDomainId);
         Assert.assertEquals(l2BridgeDomainId, InstanceIdentifier.keyOf(identifier).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -190,7 +184,7 @@ public class IidFactoryTest {
         L3ContextId l3ContextId = mock(L3ContextId.class);
         InstanceIdentifier<L3Context> identifier = IidFactory.l3ContextIid(tenantId, l3ContextId);
         Assert.assertEquals(l3ContextId, InstanceIdentifier.keyOf(identifier).getId());
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
     }
 
     @Test
@@ -240,8 +234,8 @@ public class IidFactoryTest {
     public void subnetIidTest() {
         SubnetId subnetId = mock(SubnetId.class);
         InstanceIdentifier<Subnet> identifier = IidFactory.subnetIid(tenantId, subnetId);
-        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class, TenantKey.class).getId());
-        Assert.assertEquals(subnetId, identifier.firstKeyOf(Subnet.class, SubnetKey.class).getId());
+        Assert.assertEquals(tenantId, identifier.firstKeyOf(Tenant.class).getId());
+        Assert.assertEquals(subnetId, identifier.firstKeyOf(Subnet.class).getId());
     }
 
 }