Repository: ambari Updated Branches: refs/heads/branch-3.0-perf f51351e54 -> 66a5083c5
http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java index ba67939..50b378c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java @@ -61,9 +61,7 @@ public class InstanceResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - InstanceResourceProvider provider = new InstanceResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRInstance), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance)); + InstanceResourceProvider provider = new InstanceResourceProvider(service); try { provider.createResources(request); @@ -106,9 +104,7 @@ public class InstanceResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - InstanceResourceProvider provider = new InstanceResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRInstance), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance)); + InstanceResourceProvider provider = new InstanceResourceProvider(service); Set<Resource> resources = provider.getResources(request, null); @@ -147,9 +143,7 @@ public class InstanceResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - InstanceResourceProvider provider = new InstanceResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRInstance), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance)); + InstanceResourceProvider provider = new InstanceResourceProvider(service); provider.updateResources(request, null); @@ -171,9 +165,7 @@ public class InstanceResourceProviderTest { // replay replay(service); - InstanceResourceProvider provider = new InstanceResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRInstance), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance)); + InstanceResourceProvider provider = new InstanceResourceProvider(service); Predicate predicate = new PredicateBuilder().property(InstanceResourceProvider.INSTANCE_ID_PROPERTY_ID).equals("Instance1").toPredicate(); @@ -182,17 +174,4 @@ public class InstanceResourceProviderTest { // verify verify(service); } - - @Test - public void testGetKeyPropertyIds() throws Exception { - IvoryService service = createMock(IvoryService.class); - - Map<Resource.Type, String> keyPropertyIds = PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance); - - InstanceResourceProvider provider = new InstanceResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRInstance), - keyPropertyIds); - - Assert.assertEquals(keyPropertyIds, provider.getKeyPropertyIds()); - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java index e19ad29..a1def85 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java @@ -44,7 +44,6 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; -import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; @@ -667,9 +666,7 @@ public class JMXHostProviderTest { maintenanceStateHelper, repositoryVersionDAO); ResourceProvider hostCompResourceProvider = new - HostComponentResourceProvider(PropertyHelper.getPropertyIds(Resource - .Type.HostComponent), PropertyHelper.getKeyPropertyIds(Resource.Type - .HostComponent), controller, injector); + HostComponentResourceProvider(controller, injector); ResourceProvider configResourceProvider = new ConfigurationResourceProvider( controller); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java index 6fd1a23..f8590df 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java @@ -25,7 +25,6 @@ import static org.easymock.EasyMock.verify; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.internal.JobResourceProvider.JobFetcher; @@ -35,7 +34,6 @@ import org.apache.ambari.server.controller.spi.NoSuchResourceException; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Resource.Type; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; @@ -57,18 +55,15 @@ public class JobResourceProviderTest { expected.add(createJobResponse("Cluster100", "workflow2", "job2")); expected.add(createJobResponse("Cluster100", "workflow2", "job3")); - Resource.Type type = Resource.Type.Job; - Set<String> propertyIds = PropertyHelper.getPropertyIds(type); + + Set<String> propertyIds = JobResourceProvider.propertyIds; JobFetcher jobFetcher = createMock(JobFetcher.class); expect(jobFetcher.fetchJobDetails(propertyIds, null, "workflow2", null)) .andReturn(expected).once(); replay(jobFetcher); - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(type); - ResourceProvider provider = new JobResourceProvider(propertyIds, - keyPropertyIds, jobFetcher); + ResourceProvider provider = new JobResourceProvider(jobFetcher); Request request = PropertyHelper.getReadRequest(propertyIds); Predicate predicate = new PredicateBuilder() @@ -101,10 +96,7 @@ public class JobResourceProviderTest { Set<String> requestedIds = new HashSet<>(); requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(Resource.Type.Job); - ResourceProvider provider = new TestJobResourceProvider(requestedIds, - keyPropertyIds, 1); + ResourceProvider provider = new TestJobResourceProvider(1); Request request = PropertyHelper.getReadRequest(requestedIds); Predicate predicate = new PredicateBuilder() @@ -128,10 +120,7 @@ public class JobResourceProviderTest { requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID); - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(Resource.Type.Job); - ResourceProvider provider = new TestJobResourceProvider(requestedIds, - keyPropertyIds, 2); + ResourceProvider provider = new TestJobResourceProvider(2); Request request = PropertyHelper.getReadRequest(requestedIds); Predicate predicate = new PredicateBuilder() @@ -157,10 +146,7 @@ public class JobResourceProviderTest { requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID); - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(Resource.Type.Job); - ResourceProvider provider = new TestJobResourceProvider(requestedIds, - keyPropertyIds, 3); + ResourceProvider provider = new TestJobResourceProvider(3); Request request = PropertyHelper.getReadRequest(requestedIds); Predicate predicate = new PredicateBuilder() @@ -187,10 +173,8 @@ public class JobResourceProviderTest { requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID); - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(Resource.Type.Job); - ResourceProvider provider = new TestJobResourceProvider(requestedIds, - keyPropertyIds, 4); + + ResourceProvider provider = new TestJobResourceProvider(4); Request request = PropertyHelper.getReadRequest(requestedIds); Predicate predicate = new PredicateBuilder() @@ -220,9 +204,8 @@ public class JobResourceProviderTest { } private static class TestJobResourceProvider extends JobResourceProvider { - protected TestJobResourceProvider(Set<String> propertyIds, - Map<Type,String> keyPropertyIds, int type) { - super(propertyIds, keyPropertyIds); + protected TestJobResourceProvider(int type) { + super(); this.jobFetcher = new TestJobFetcher(type); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java index ca8127e..caea9f2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java @@ -80,7 +80,7 @@ public class KerberosDescriptorResourceProviderTest { EasyMock.replay(request); kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); + kerberosDescriptorFactory, null); // WHEN kerberosDescriptorResourceProvider.createResources(request); @@ -97,7 +97,7 @@ public class KerberosDescriptorResourceProviderTest { EasyMock.replay(request); kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); + kerberosDescriptorFactory, null); // WHEN kerberosDescriptorResourceProvider.createResources(request); @@ -112,7 +112,7 @@ public class KerberosDescriptorResourceProviderTest { // GIVEN kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); + kerberosDescriptorFactory, null); EasyMock.expect(request.getProperties()) .andReturn(requestPropertySet(KERBEROS_DESCRIPTORS_KERBEROS_DESCRIPTOR_NAME, TEST_KERBEROS_DESCRIPTOR_NAME)) http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java index 39ba4b9..ce9b50f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java @@ -43,7 +43,6 @@ import org.apache.ambari.server.controller.utilities.PredicateBuilder; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.security.TestAuthenticationFactory; import org.apache.ambari.server.security.authorization.AuthorizationException; -import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; import org.springframework.security.core.Authentication; @@ -78,8 +77,8 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) - .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); + expect(resourceProviderFactory.getMemberResourceProvider(eq(managementController))) + .andReturn(new MemberResourceProvider(managementController)).anyTimes(); managementController.createMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe")); expectLastCall().atLeastOnce(); @@ -91,8 +90,6 @@ public class MemberResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // add the property map to a set for the request. add more maps for multiple creates @@ -134,8 +131,8 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) - .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); + expect(resourceProviderFactory.getMemberResourceProvider(eq(managementController))) + .andReturn(new MemberResourceProvider(managementController)).anyTimes(); expect(managementController.getMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet(null, null))) .andReturn(Collections.emptySet()) @@ -148,8 +145,6 @@ public class MemberResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // create the request @@ -183,8 +178,8 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); // set expectations - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) - .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); + expect(resourceProviderFactory.getMemberResourceProvider(eq(managementController))) + .andReturn(new MemberResourceProvider(managementController)).anyTimes(); managementController.updateMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe")); expectLastCall().atLeastOnce(); @@ -196,8 +191,6 @@ public class MemberResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // add the property map to a set for the request. @@ -238,8 +231,8 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); // set expectations - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) - .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); + expect(resourceProviderFactory.getMemberResourceProvider(eq(managementController))) + .andReturn(new MemberResourceProvider(managementController)).anyTimes(); managementController.deleteMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", null)); expectLastCall().atLeastOnce(); @@ -251,8 +244,6 @@ public class MemberResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); PredicateBuilder builder = new PredicateBuilder(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java index c0695b1..b3f2c3c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java @@ -172,8 +172,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // add the property map to a set for the request. add more maps for multiple creates @@ -220,9 +218,7 @@ public class RequestResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); replay(managementController, clusters, cluster); - ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, - PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), - managementController); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, managementController); Map<String, String> requestInfoProperties = new HashMap<>(); Request request; @@ -314,8 +310,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -366,8 +360,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -419,8 +411,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -480,8 +470,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -547,8 +535,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -601,8 +587,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -672,8 +656,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -753,8 +735,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -835,8 +815,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // TEST CASE: Check update request validation (abort reason not specified) @@ -921,8 +899,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Predicate predicate = new PredicateBuilder().property(RequestResourceProvider.REQUEST_ID_PROPERTY_ID). @@ -1014,8 +990,6 @@ public class RequestResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, requestInfoProperties); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); provider.createResources(request); @@ -1117,8 +1091,6 @@ public class RequestResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, requestInfoProperties); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // Neither action nor commands are specified @@ -1219,8 +1191,6 @@ public class RequestResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, requestInfoProperties); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); provider.createResources(request); @@ -1334,8 +1304,6 @@ public class RequestResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, requestInfoProperties); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); requestInfoProperties.put(RequestOperationLevel.OPERATION_CLUSTER_ID, c1); @@ -1526,8 +1494,6 @@ public class RequestResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, requestInfoProperties); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); provider.createResources(request); ExecuteActionRequest capturedRequest = actionRequest.getValue(); @@ -1582,8 +1548,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -1636,8 +1600,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -1754,8 +1716,6 @@ public class RequestResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = ImmutableSet.of( http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java index 6d4f72d..a1e33009 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java @@ -65,8 +65,6 @@ public class RequestScheduleResourceProviderTest { return (RequestScheduleResourceProvider) AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController ); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java index 4316647..b861830 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java @@ -70,8 +70,6 @@ public class RootServiceComponentResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java index ce3656c..1f37f93 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java @@ -101,8 +101,6 @@ public class RootServiceHostComponentResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java index 96bc7c9..83be941 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java @@ -63,8 +63,6 @@ public class RootServiceResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java index 05232ea..a6c7d42 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -40,7 +39,6 @@ import javax.annotation.Nonnull; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.spi.Request; -import org.apache.ambari.server.controller.spi.Resource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -73,11 +71,8 @@ public class StackAdvisorResourceProviderTest { @Nonnull private RecommendationResourceProvider createRecommendationResourceProvider() { - Map<Resource.Type, String> keyPropertyIds = Collections.emptyMap(); - Set<String> propertyIds = Collections.emptySet(); AmbariManagementController ambariManagementController = mock(AmbariManagementController.class); - return new RecommendationResourceProvider(propertyIds, - keyPropertyIds, ambariManagementController); + return new RecommendationResourceProvider(ambariManagementController); } @Nonnull @@ -136,11 +131,8 @@ public class StackAdvisorResourceProviderTest { @Test public void testStackAdvisorWithEmptyHosts() { - Map<Resource.Type, String> keyPropertyIds = Collections.emptyMap(); - Set<String> propertyIds = Collections.emptySet(); AmbariManagementController ambariManagementController = mock(AmbariManagementController.class); - RecommendationResourceProvider provider = new RecommendationResourceProvider(propertyIds, - keyPropertyIds, ambariManagementController); + RecommendationResourceProvider provider = new RecommendationResourceProvider(ambariManagementController); Request request = mock(Request.class); Set<Map<String, Object>> propertiesSet = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java index 21df88d..3203aa1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java @@ -82,8 +82,6 @@ public class StackArtifactResourceProviderTest { return (StackArtifactResourceProvider) AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProviderTest.java index 7c88852..c09852a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProviderTest.java @@ -58,8 +58,6 @@ public class StackConfigurationDependencyResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProviderTest.java index 9c48ad0..cddfe2f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProviderTest.java @@ -67,8 +67,6 @@ public class StackConfigurationResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -139,8 +137,6 @@ public class StackConfigurationResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProviderTest.java index f350153..637bd5f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProviderTest.java @@ -42,7 +42,6 @@ import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; -import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.state.DependencyInfo; import org.junit.Before; import org.junit.BeforeClass; @@ -164,8 +163,6 @@ public class StackDependencyResourceProviderTest { } private StackDependencyResourceProvider createProvider() { - return new StackDependencyResourceProvider( - PropertyHelper.getPropertyIds(Resource.Type.StackServiceComponentDependency), - PropertyHelper.getKeyPropertyIds(Resource.Type.StackServiceComponentDependency)); + return new StackDependencyResourceProvider(); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProviderTest.java index e9742bd..3d9607a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProviderTest.java @@ -67,8 +67,6 @@ public class StackLevelConfigurationResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); @@ -133,8 +131,6 @@ public class StackLevelConfigurationResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java index 4281e33..9d81d15 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java @@ -58,8 +58,6 @@ public class StackResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Set<String> propertyIds = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java index 2a2ef0b..a9bd831 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java @@ -86,8 +86,6 @@ public class StackServiceResourceProviderTest { Request request = PropertyHelper.getReadRequest(SERVICE_PROPERTIES_PROPERTY_ID); ResourceProvider stackServiceResourceProvider = AbstractControllerResourceProvider.getResourceProvider(type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // When @@ -129,8 +127,6 @@ public class StackServiceResourceProviderTest { Request request = PropertyHelper.getReadRequest(SERVICE_PROPERTIES_PROPERTY_ID); ResourceProvider stackServiceResourceProvider = AbstractControllerResourceProvider.getResourceProvider(type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // When http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java index 492c012..0fedc65 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java @@ -89,9 +89,7 @@ public class TargetClusterResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRTargetCluster)); + TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service); provider.createResources(request); @@ -136,9 +134,7 @@ public class TargetClusterResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRTargetCluster)); + TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service); Set<Resource> resources = provider.getResources(request, null); @@ -185,9 +181,7 @@ public class TargetClusterResourceProviderTest { Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); - TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRTargetCluster)); + TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service); provider.updateResources(request, null); @@ -219,9 +213,7 @@ public class TargetClusterResourceProviderTest { replay(service); - TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), - PropertyHelper.getKeyPropertyIds(Resource.Type.DRTargetCluster)); + TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service); Predicate predicate = new PredicateBuilder().property(TargetClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID).equals("Cluster1").toPredicate(); @@ -231,16 +223,4 @@ public class TargetClusterResourceProviderTest { verify(service); } - @Test - public void testGetKeyPropertyIds() throws Exception { - IvoryService service = createMock(IvoryService.class); - - Map<Resource.Type, String> keyPropertyIds = PropertyHelper.getKeyPropertyIds(Resource.Type.DRTargetCluster); - - TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, - PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), - keyPropertyIds); - - Assert.assertEquals(keyPropertyIds, provider.getKeyPropertyIds()); - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProviderTest.java index 992bce0..c028082 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProviderTest.java @@ -61,7 +61,7 @@ public class TaskAttemptResourceProviderTest { "taskAttempt3")); Resource.Type type = Resource.Type.TaskAttempt; - Set<String> propertyIds = PropertyHelper.getPropertyIds(type); + Set<String> propertyIds = TaskAttemptResourceProvider.propertyIds; TaskAttemptFetcher taskAttemptFetcher = createMock(TaskAttemptFetcher.class); expect( http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java index 365d408..d7ac273 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java @@ -74,8 +74,6 @@ public class TaskResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // add the property map to a set for the request. add more maps for multiple creates @@ -112,7 +110,7 @@ public class TaskResourceProviderTest { Injector m_injector = Guice.createInjector(new InMemoryDefaultTestModule()); TaskResourceProvider provider = (TaskResourceProvider) AbstractControllerResourceProvider.getResourceProvider( - type, PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), amc); + type, amc); m_injector.injectMembers(provider); TaskResourceProvider.s_dao = hostRoleCommandDAO; @@ -176,7 +174,7 @@ public class TaskResourceProviderTest { Injector m_injector = Guice.createInjector(new InMemoryDefaultTestModule()); TaskResourceProvider provider = (TaskResourceProvider) AbstractControllerResourceProvider.getResourceProvider( - type, PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), amc); + type, amc); m_injector.injectMembers(provider); TaskResourceProvider.s_dao = hostRoleCommandDAO; @@ -245,8 +243,6 @@ public class TaskResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); // add the property map to a set for the request. @@ -280,8 +276,6 @@ public class TaskResourceProviderTest { ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); Predicate predicate = new PredicateBuilder().property(TaskResourceProvider.TASK_ID_PROPERTY_ID).equals("Task100").toPredicate(); @@ -296,9 +290,7 @@ public class TaskResourceProviderTest { // Test general case AmbariManagementController managementController = createMock(AmbariManagementController.class); - TaskResourceProvider taskResourceProvider = new TaskResourceProvider( - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); + TaskResourceProvider taskResourceProvider = new TaskResourceProvider(managementController); replay(managementController); @@ -332,9 +324,7 @@ public class TaskResourceProviderTest { // Test general case AmbariManagementController managementController = createMock(AmbariManagementController.class); - TaskResourceProvider taskResourceProvider = new TaskResourceProvider( - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); + TaskResourceProvider taskResourceProvider = new TaskResourceProvider(managementController); replay(managementController); @@ -356,9 +346,7 @@ public class TaskResourceProviderTest { // Test general case AmbariManagementController managementController = createMock(AmbariManagementController.class); - TaskResourceProvider taskResourceProvider = new TaskResourceProvider( - PropertyHelper.getPropertyIds(type), - PropertyHelper.getKeyPropertyIds(type), managementController); + TaskResourceProvider taskResourceProvider = new TaskResourceProvider(managementController); replay(managementController); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestIvoryProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestIvoryProviderModule.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestIvoryProviderModule.java index 90f1011..dca7b35 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestIvoryProviderModule.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TestIvoryProviderModule.java @@ -40,11 +40,11 @@ public class TestIvoryProviderModule extends DefaultProviderModule{ switch (type.getInternalType()) { case DRFeed: - return new FeedResourceProvider(service, propertyIds, keyPropertyIds); + return new FeedResourceProvider(service); case DRTargetCluster: - return new TargetClusterResourceProvider(service, propertyIds, keyPropertyIds); + return new TargetClusterResourceProvider(service); case DRInstance: - return new InstanceResourceProvider(service, propertyIds, keyPropertyIds); + return new InstanceResourceProvider(service); } return super.createResourceProvider(type); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index ec240df..d7f55b3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -1174,9 +1174,7 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { AbstractControllerResourceProvider.init(factory); Resource.Type type = Type.Upgrade; - return (UpgradeResourceProvider) AbstractControllerResourceProvider.getResourceProvider(type, - PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), - amc); + return (UpgradeResourceProvider) AbstractControllerResourceProvider.getResourceProvider(type, amc); } private RequestStatus testCreateResources() throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java index c4f0f34..7d9a964 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java @@ -91,7 +91,7 @@ public class UserResourceProviderDBTest { Set<String> propertyIds = PropertyHelper.getPropertyIds(userType); Map<Resource.Type,String> keyPropertyIds = PropertyHelper.getKeyPropertyIds(userType); - userResourceProvider = new UserResourceProvider(propertyIds, keyPropertyIds, amc); + userResourceProvider = new UserResourceProvider(amc); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java index 9efad8a..f36bb63 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java @@ -540,8 +540,6 @@ public class UserResourceProviderTest extends EasyMockSupport { private ResourceProvider getResourceProvider(AmbariManagementController managementController) { return AbstractControllerResourceProvider.getResourceProvider( Resource.Type.User, - PropertyHelper.getPropertyIds(Resource.Type.User), - PropertyHelper.getKeyPropertyIds(Resource.Type.User), managementController); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ValidationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ValidationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ValidationResourceProviderTest.java index 42d4770..34337ae 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ValidationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ValidationResourceProviderTest.java @@ -47,8 +47,7 @@ public class ValidationResourceProviderTest { Map<Resource.Type, String> keyPropertyIds = Collections.emptyMap(); Set<String> propertyIds = Collections.singleton(ValidationResourceProvider.VALIDATION_ID_PROPERTY_ID); AmbariManagementController ambariManagementController = mock(AmbariManagementController.class); - ValidationResourceProvider provider = spy(new ValidationResourceProvider(propertyIds, - keyPropertyIds, ambariManagementController)); + ValidationResourceProvider provider = spy(new ValidationResourceProvider(ambariManagementController)); StackAdvisorRequest stackAdvisorRequest = mock(StackAdvisorRequest.class); Request request = mock(Request.class); doReturn(stackAdvisorRequest).when(provider).prepareStackAdvisorRequest(request); http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WorkflowResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WorkflowResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WorkflowResourceProviderTest.java index 337dc46..ac064c5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WorkflowResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WorkflowResourceProviderTest.java @@ -35,7 +35,6 @@ import org.apache.ambari.server.controller.spi.NoSuchResourceException; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Resource.Type; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; @@ -58,7 +57,20 @@ public class WorkflowResourceProviderTest { expected.add(createWorkflowResponse("Cluster100", "workflow3")); Resource.Type type = Resource.Type.Workflow; - Set<String> propertyIds = PropertyHelper.getPropertyIds(type); + Set<String> propertyIds = new HashSet<>(); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_CLUSTER_NAME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_ID_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_NAME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_USER_NAME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_START_TIME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_LAST_UPDATE_TIME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_ELAPSED_TIME_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_INPUT_BYTES_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_OUTPUT_BYTES_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_NUM_JOBS_TOTAL_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_NUM_JOBS_COMPLETED_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_PARENT_ID_PROPERTY_ID); + propertyIds.add(WorkflowResourceProvider.WORKFLOW_CONTEXT_PROPERTY_ID); WorkflowFetcher workflowFetcher = createMock(WorkflowFetcher.class); expect(workflowFetcher.fetchWorkflows(propertyIds, "Cluster100", null)) @@ -67,8 +79,7 @@ public class WorkflowResourceProviderTest { Map<Resource.Type,String> keyPropertyIds = PropertyHelper .getKeyPropertyIds(type); - ResourceProvider provider = new WorkflowResourceProvider(propertyIds, - keyPropertyIds, workflowFetcher); + ResourceProvider provider = new WorkflowResourceProvider(workflowFetcher); Request request = PropertyHelper.getReadRequest(propertyIds); Predicate predicate = new PredicateBuilder() @@ -100,11 +111,7 @@ public class WorkflowResourceProviderTest { NoSuchParentResourceException { Set<String> requestedIds = new HashSet<>(); requestedIds.add(WorkflowResourceProvider.WORKFLOW_ID_PROPERTY_ID); - - Map<Resource.Type,String> keyPropertyIds = PropertyHelper - .getKeyPropertyIds(Resource.Type.Workflow); - ResourceProvider provider = new TestWorkflowResourceProvider(requestedIds, - keyPropertyIds); + ResourceProvider provider = new TestWorkflowResourceProvider(); Request request = PropertyHelper.getReadRequest(requestedIds); Predicate predicate = new PredicateBuilder() @@ -131,9 +138,8 @@ public class WorkflowResourceProviderTest { private static class TestWorkflowResourceProvider extends WorkflowResourceProvider { - protected TestWorkflowResourceProvider(Set<String> propertyIds, - Map<Type,String> keyPropertyIds) { - super(propertyIds, keyPropertyIds, null); + protected TestWorkflowResourceProvider() { + super(null); this.workflowFetcher = new TestWorkflowFetcher(); }
