You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/12/08 19:26:46 UTC
[46/46] ambari git commit: AMBARI-14714. Fix merge conflict (leftover
member causing NPE)
AMBARI-14714. Fix merge conflict (leftover member causing NPE)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de877aa7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de877aa7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de877aa7
Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: de877aa7fc9a3e2a635910e5b01fcc69432bd8d0
Parents: 5ab1e5b
Author: Doroszlai, Attila <ad...@hortonworks.com>
Authored: Wed Dec 6 21:45:36 2017 +0100
Committer: Doroszlai, Attila <ad...@hortonworks.com>
Committed: Fri Dec 8 20:25:15 2017 +0100
----------------------------------------------------------------------
...RootServiceComponentConfigurationResourceProvider.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/de877aa7/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
index 5a6dff4..b9e7d67 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
@@ -38,20 +38,14 @@ import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PredicateHelper;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.inject.Inject;
public class RootServiceComponentConfigurationResourceProvider extends AbstractAuthorizedResourceProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(RootServiceComponentConfigurationResourceProvider.class);
-
static final String RESOURCE_KEY = "Configuration";
public static final String CONFIGURATION_CATEGORY_PROPERTY_ID = PropertyHelper.getPropertyId(RESOURCE_KEY, "category");
@@ -84,12 +78,8 @@ public class RootServiceComponentConfigurationResourceProvider extends AbstractA
}
@Inject
- private AmbariEventPublisher publisher;
-
- @Inject
private RootServiceComponentConfigurationHandlerFactory rootServiceComponentConfigurationHandlerFactory;
-
public RootServiceComponentConfigurationResourceProvider() {
super(PROPERTIES, PK_PROPERTY_MAP);