Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BA487200B91 for ; Thu, 29 Sep 2016 17:11:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B91F2160AE3; Thu, 29 Sep 2016 15:11:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5F27E160AD7 for ; Thu, 29 Sep 2016 17:11:17 +0200 (CEST) Received: (qmail 10422 invoked by uid 500); 29 Sep 2016 15:11:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 10410 invoked by uid 99); 29 Sep 2016 15:11:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Sep 2016 15:11:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F980E053F; Thu, 29 Sep 2016 15:11:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlevas@apache.org To: commits@ambari.apache.org Message-Id: <985e24d883d54229a22937282f84c4ab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18481. Fix Authentication data is not available error in ConfigGroupResourceProviderTest (rlevas) Date: Thu, 29 Sep 2016 15:11:16 +0000 (UTC) archived-at: Thu, 29 Sep 2016 15:11:18 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 eb884e172 -> b3034b9f2 AMBARI-18481. Fix Authentication data is not available error in ConfigGroupResourceProviderTest (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3034b9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3034b9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3034b9f Branch: refs/heads/branch-2.5 Commit: b3034b9f22e9243a014b2c53b7919deb40b1be4f Parents: eb884e1 Author: Robert Levas Authored: Thu Sep 29 11:11:09 2016 -0400 Committer: Robert Levas Committed: Thu Sep 29 11:11:09 2016 -0400 ---------------------------------------------------------------------- .../ConfigGroupResourceProviderTest.java | 229 +++++++++---------- 1 file changed, 112 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b3034b9f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java index 4dec990..eb2e0e8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,6 @@ package org.apache.ambari.server.controller.internal; import com.google.inject.Binder; import com.google.inject.Guice; -import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.util.Modules; import org.apache.ambari.server.controller.AmbariManagementController; @@ -51,7 +50,6 @@ import org.easymock.Capture; import org.easymock.IAnswer; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -73,33 +71,28 @@ import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.newCapture; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.createStrictMock; public class ConfigGroupResourceProviderTest { - private Injector injector; - private HostDAO hostDAO = null; - @BeforeClass - public static void setupAuthentication() { + @Before + public void setup() throws Exception { // Clear authenticated user so that authorization checks will pass SecurityContextHolder.getContext().setAuthentication(null); - } - @Before - public void setup() throws Exception { hostDAO = createStrictMock(HostDAO.class); // Create injector after all mocks have been initialized - injector = Guice.createInjector(Modules.override( + Guice.createInjector(Modules.override( new InMemoryDefaultTestModule()).with(new MockModule())); } - ConfigGroupResourceProvider getConfigGroupResourceProvider + private ConfigGroupResourceProvider getConfigGroupResourceProvider (AmbariManagementController managementController) { Resource.Type type = Resource.Type.ConfigGroup; @@ -171,23 +164,22 @@ public class ConfigGroupResourceProviderTest { expect(hostEntity1.getHostId()).andReturn(1L).atLeastOnce(); expect(hostEntity2.getHostId()).andReturn(2L).atLeastOnce(); - Capture clusterCapture = new Capture(); - Capture captureName = new Capture(); - Capture captureDesc = new Capture(); - Capture captureTag = new Capture(); - Capture> captureConfigs = new Capture>(); - Capture> captureHosts = new Capture>(); + Capture clusterCapture = newCapture(); + Capture captureName = newCapture(); + Capture captureDesc = newCapture(); + Capture captureTag = newCapture(); + Capture> captureConfigs = newCapture(); + Capture> captureHosts = newCapture(); expect(configGroupFactory.createNew(capture(clusterCapture), - capture(captureName), capture(captureTag), capture(captureDesc), - capture(captureConfigs), capture(captureHosts))).andReturn(configGroup); + capture(captureName), capture(captureTag), capture(captureDesc), + capture(captureConfigs), capture(captureHosts))).andReturn(configGroup); replay(managementController, clusters, cluster, configGroupFactory, - configGroup, response, hostDAO, hostEntity1, hostEntity2); + configGroup, response, hostDAO, hostEntity1, hostEntity2); ResourceProvider provider = getConfigGroupResourceProvider - (managementController); + (managementController); Set> propertySet = new LinkedHashSet>(); Map properties = new LinkedHashMap(); @@ -210,15 +202,15 @@ public class ConfigGroupResourceProviderTest { configSet.add(configs); properties.put(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID, - "test-1"); + "test-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID, - "tag-1"); + "tag-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_PROPERTY_ID, - hostSet); + hostSet); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_CONFIGS_PROPERTY_ID, - configSet); + configSet); propertySet.add(properties); @@ -229,10 +221,10 @@ public class ConfigGroupResourceProviderTest { provider.createResources(request); verify(managementController, clusters, cluster, configGroupFactory, - configGroup, response, hostDAO, hostEntity1, hostEntity2); + configGroup, response, hostDAO, hostEntity1, hostEntity2); assertEquals("version100", captureConfigs.getValue().get("core-site") - .getTag()); + .getTag()); assertTrue(captureHosts.getValue().containsKey(1L)); assertTrue(captureHosts.getValue().containsKey(2L)); } @@ -280,33 +272,33 @@ public class ConfigGroupResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(managementController.getConfigGroupFactory()).andReturn - (configGroupFactory).anyTimes(); + (configGroupFactory).anyTimes(); expect(managementController.getAuthName()).andReturn("admin").anyTimes(); expect(cluster.getConfigGroups()).andReturn(configGroupMap); expect(configGroupFactory.createNew((Cluster) anyObject(), (String) anyObject(), - (String) anyObject(), (String) anyObject(), (HashMap) anyObject(), - (HashMap) anyObject())).andReturn(configGroup).anyTimes(); + (String) anyObject(), (String) anyObject(), (HashMap) anyObject(), + (HashMap) anyObject())).andReturn(configGroup).anyTimes(); expect(configGroup.getClusterName()).andReturn("Cluster100").anyTimes(); expect(configGroup.getName()).andReturn("test-1").anyTimes(); expect(configGroup.getTag()).andReturn("tag-1").anyTimes(); replay(managementController, clusters, cluster, configGroupFactory, - configGroup, response); + configGroup, response); ResourceProvider provider = getConfigGroupResourceProvider - (managementController); + (managementController); Map properties = new LinkedHashMap(); Set> propertySet = new LinkedHashSet>(); properties.put(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID, - "test-1"); + "test-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID, - "tag-1"); + "tag-1"); propertySet.add(properties); Request request = PropertyHelper.getCreateRequest(propertySet, null); @@ -316,14 +308,14 @@ public class ConfigGroupResourceProviderTest { Exception exception = null; try { provider.createResources(request); - } catch (AuthorizationException e){ + } catch (AuthorizationException e) { throw e; } catch (Exception e) { exception = e; } verify(managementController, clusters, cluster, configGroupFactory, - configGroup, response); + configGroup, response); assertNotNull(exception); assertTrue(exception instanceof ResourceAlreadyExistsException); @@ -409,7 +401,7 @@ public class ConfigGroupResourceProviderTest { properties.put(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID, "tag-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_PROPERTY_ID, - hostSet ); + hostSet); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_CONFIGS_PROPERTY_ID, configSet); @@ -429,8 +421,7 @@ public class ConfigGroupResourceProviderTest { SystemException systemException = null; try { provider.updateResources(request, predicate); - } - catch (SystemException e){ + } catch (SystemException e) { systemException = e; } assertNotNull(systemException); @@ -481,7 +472,7 @@ public class ConfigGroupResourceProviderTest { final ConfigGroup configGroup = createNiceMock(ConfigGroup.class); ConfigGroupResponse configGroupResponse = createNiceMock - (ConfigGroupResponse.class); + (ConfigGroupResponse.class); expect(cluster.isConfigTypeExists("core-site")).andReturn(true).anyTimes(); expect(managementController.getClusters()).andReturn(clusters).anyTimes(); @@ -516,10 +507,10 @@ public class ConfigGroupResourceProviderTest { }); replay(managementController, clusters, cluster, - configGroup, response, configGroupResponse, configHelper, hostDAO, hostEntity1, hostEntity2, h1, h2); + configGroup, response, configGroupResponse, configHelper, hostDAO, hostEntity1, hostEntity2, h1, h2); ResourceProvider provider = getConfigGroupResourceProvider - (managementController); + (managementController); Map properties = new LinkedHashMap(); @@ -541,15 +532,15 @@ public class ConfigGroupResourceProviderTest { configSet.add(configs); properties.put(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID, - "test-1"); + "test-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID, - "tag-1"); + "tag-1"); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_PROPERTY_ID, - hostSet ); + hostSet); properties.put(ConfigGroupResourceProvider.CONFIGGROUP_CONFIGS_PROPERTY_ID, - configSet); + configSet); Map mapRequestProps = new HashMap(); mapRequestProps.put("context", "Called from a test"); @@ -557,17 +548,17 @@ public class ConfigGroupResourceProviderTest { Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps); Predicate predicate = new PredicateBuilder().property - (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals - ("Cluster100").and(). - property(ConfigGroupResourceProvider.CONFIGGROUP_ID_PROPERTY_ID).equals - (25L).toPredicate(); + (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals + ("Cluster100").and(). + property(ConfigGroupResourceProvider.CONFIGGROUP_ID_PROPERTY_ID).equals + (25L).toPredicate(); SecurityContextHolder.getContext().setAuthentication(authentication); provider.updateResources(request, predicate); verify(managementController, clusters, cluster, - configGroup, response, configGroupResponse, configHelper, hostDAO, hostEntity1, hostEntity2, h1, h2); + configGroup, response, configGroupResponse, configHelper, hostDAO, hostEntity1, hostEntity2, h1, h2); } @Test @@ -607,8 +598,12 @@ public class ConfigGroupResourceProviderTest { Cluster cluster = createNiceMock(Cluster.class); Host h1 = createNiceMock(Host.class); final Long host1Id = 1L; - List hostIds = new ArrayList() {{ add(host1Id); }}; - List hostNames = new ArrayList() {{ add("h1"); }}; + List hostIds = new ArrayList() {{ + add(host1Id); + }}; + List hostNames = new ArrayList() {{ + add("h1"); + }}; HostEntity hostEntity1 = createMock(HostEntity.class); expect(hostDAO.getHostNamesByHostIds(hostIds)).andReturn(hostNames).atLeastOnce(); @@ -678,8 +673,9 @@ public class ConfigGroupResourceProviderTest { replay(managementController, clusters, cluster, hostDAO, hostEntity1, configGroup1, configGroup2, configGroup3, configGroup4, response1, response2, response3, response4); - ResourceProvider resourceProvider = getConfigGroupResourceProvider - (managementController); + SecurityContextHolder.getContext().setAuthentication(authentication); + + ResourceProvider resourceProvider = getConfigGroupResourceProvider(managementController); Set propertyIds = new HashSet(); @@ -688,125 +684,122 @@ public class ConfigGroupResourceProviderTest { // Read all Predicate predicate = new PredicateBuilder().property - (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) - .equals("Cluster100").toPredicate(); + (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) + .equals("Cluster100").toPredicate(); Request request = PropertyHelper.getReadRequest(propertyIds); - Set resources = resourceProvider.getResources(request, - predicate); + Set resources = resourceProvider.getResources(request, predicate); assertEquals(4, resources.size()); // Read by id predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_ID_PROPERTY_ID).equals(1L).and().property - (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) - .equals("Cluster100").toPredicate(); - - SecurityContextHolder.getContext().setAuthentication(authentication); + .CONFIGGROUP_ID_PROPERTY_ID).equals(1L).and().property + (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) + .equals("Cluster100").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); assertEquals(1L, resources.iterator().next().getPropertyValue - (ConfigGroupResourceProvider.CONFIGGROUP_ID_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_ID_PROPERTY_ID)); // Read by Name predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID) - .equals("g2").toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID) + .equals("g2").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); assertEquals("g2", resources.iterator().next().getPropertyValue - (ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_NAME_PROPERTY_ID)); // Read by tag predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) - .equals("t3").toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) + .equals("t3").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); assertEquals("t3", resources.iterator().next().getPropertyValue - (ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID)); // Read by hostname (hosts=h1) predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_PROPERTY_ID) - .equals("h1").toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_PROPERTY_ID) + .equals("h1").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); Set> hostSet = (Set>) - resources.iterator().next() - .getPropertyValue(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_PROPERTY_ID); + resources.iterator().next() + .getPropertyValue(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_PROPERTY_ID); assertEquals("h1", hostSet.iterator().next().get - (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); // Read by hostname (hosts/host_name=h1) predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_HOSTNAME_PROPERTY_ID) - .equals("h1").toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_HOSTS_HOSTNAME_PROPERTY_ID) + .equals("h1").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); hostSet = (Set>) - resources.iterator().next() - .getPropertyValue(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_PROPERTY_ID); + resources.iterator().next() + .getPropertyValue(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_PROPERTY_ID); assertEquals("h1", hostSet.iterator().next().get - (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); // Read by tag and hostname (hosts=h1) - Positive predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) - .equals("t4").and().property(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_PROPERTY_ID).equals(host1Id).toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) + .equals("t4").and().property(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_PROPERTY_ID).equals(host1Id).toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); hostSet = (Set>) - resources.iterator().next() - .getPropertyValue(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_PROPERTY_ID); + resources.iterator().next() + .getPropertyValue(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_PROPERTY_ID); assertEquals("h1", hostSet.iterator().next().get - (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); // Read by tag and hostname (hosts/host_name=h1) - Positive predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() - .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) - .equals("t4").and().property(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_HOSTNAME_PROPERTY_ID).equals("h1").toPredicate(); + .CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() + .property(ConfigGroupResourceProvider.CONFIGGROUP_TAG_PROPERTY_ID) + .equals("t4").and().property(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_HOSTNAME_PROPERTY_ID).equals("h1").toPredicate(); resources = resourceProvider.getResources(request, predicate); assertEquals(1, resources.size()); hostSet = (Set>) - resources.iterator().next() - .getPropertyValue(ConfigGroupResourceProvider - .CONFIGGROUP_HOSTS_PROPERTY_ID); + resources.iterator().next() + .getPropertyValue(ConfigGroupResourceProvider + .CONFIGGROUP_HOSTS_PROPERTY_ID); assertEquals("h1", hostSet.iterator().next().get - (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); + (ConfigGroupResourceProvider.CONFIGGROUP_HOSTNAME_PROPERTY_ID)); // Read by id predicate = new PredicateBuilder().property(ConfigGroupResourceProvider - .CONFIGGROUP_ID_PROPERTY_ID).equals(11L).and().property - (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) - .equals("Cluster100").toPredicate(); + .CONFIGGROUP_ID_PROPERTY_ID).equals(11L).and().property + (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) + .equals("Cluster100").toPredicate(); NoSuchResourceException resourceException = null; try { @@ -866,16 +859,16 @@ public class ConfigGroupResourceProviderTest { replay(managementController, clusters, cluster, configGroup); ResourceProvider resourceProvider = getConfigGroupResourceProvider - (managementController); + (managementController); AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver(); ((ObservableResourceProvider) resourceProvider).addObserver(observer); Predicate predicate = new PredicateBuilder().property - (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) - .equals("Cluster100").and().property(ConfigGroupResourceProvider - .CONFIGGROUP_ID_PROPERTY_ID).equals(1L).toPredicate(); + (ConfigGroupResourceProvider.CONFIGGROUP_CLUSTER_NAME_PROPERTY_ID) + .equals("Cluster100").and().property(ConfigGroupResourceProvider + .CONFIGGROUP_ID_PROPERTY_ID).equals(1L).toPredicate(); SecurityContextHolder.getContext().setAuthentication(authentication); @@ -909,7 +902,9 @@ public class ConfigGroupResourceProviderTest { desiredConfigProperties.add(desiredConfig1); Map properties = new HashMap(); - properties.put("ConfigGroup/hosts", new HashMap(){{put("host_name", "ambari1");}}); + properties.put("ConfigGroup/hosts", new HashMap() {{ + put("host_name", "ambari1"); + }}); properties.put("ConfigGroup/cluster_name", "c"); properties.put("ConfigGroup/desired_configs", desiredConfigProperties);