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/11/14 17:36:29 UTC
[1/2] ambari git commit: AMBARI-22426. Push down Logger instances
(adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/trunk d0ef1449a -> ed7e121f3
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java
index ca4fe6e..0162928 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.controller.ServiceComponentHostRequest;
import org.apache.ambari.server.controller.ServiceComponentHostResponse;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Determines the service status for Flume. Generically, this means that
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class FlumeServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(FlumeServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
index eac0dce..58d1687 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java
@@ -32,6 +32,8 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Calculator of HBase service state.
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class HBaseServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(HBaseServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
index 7bbad2a..68cb4f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java
@@ -32,6 +32,8 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Calculator of HDFS service state.
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class HDFSServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(HDFSServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
index 77e44a5..353cf5f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java
@@ -32,6 +32,8 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Calculator of HIVE service state.
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class HiveServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(HiveServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
index 1803f70..6c55d0b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java
@@ -32,6 +32,8 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Calculator of Oozie service state.
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class OozieServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
index 2f1619f..23f5f4c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java
@@ -32,6 +32,8 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Calculator of YARN service state.
@@ -40,6 +42,8 @@ import org.apache.ambari.server.state.State;
public final class YARNServiceCalculatedState extends DefaultServiceCalculatedState
implements ServiceCalculatedState {
+ private static final Logger LOG = LoggerFactory.getLogger(YARNServiceCalculatedState.class);
+
@Override
public State getState(String clusterName, String serviceName) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java
index 9afcf51..82b527f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
@Singleton
public class DefaultLdapConnectionConfigService implements LdapConnectionConfigService {
- private static Logger LOG = LoggerFactory.getLogger(DefaultLdapConnectionConfigService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultLdapConnectionConfigService.class);
@Inject
public DefaultLdapConnectionConfigService() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RemoteAmbariClusterEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RemoteAmbariClusterEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RemoteAmbariClusterEntity.java
index 4f10d6f..aad37d8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RemoteAmbariClusterEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RemoteAmbariClusterEntity.java
@@ -65,7 +65,7 @@ public class RemoteAmbariClusterEntity {
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(RemoteAmbariClusterEntity.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RemoteAmbariClusterEntity.class);
@Id
@Column(name = "cluster_id", nullable = false)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
index b7ff297..b2cdb1d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
@@ -42,7 +42,7 @@ import com.google.inject.Inject;
* Provides LDAP user authorization logic for Ambari Server
*/
public class AmbariLdapAuthenticationProvider implements AuthenticationProvider {
- Logger LOG = LoggerFactory.getLogger(AmbariLdapAuthenticationProvider.class);
+ static Logger LOG = LoggerFactory.getLogger(AmbariLdapAuthenticationProvider.class); // exposed and mutable for "test"
Configuration configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
index 1f2f6db..ce0e843 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/CredentialProvider.java
@@ -42,7 +42,7 @@ public class CredentialProvider {
'2', '3', '4', '5', '6', '7', '8', '9'};
private CredentialStore keystoreService;
- static final Logger LOG = LoggerFactory.getLogger(CredentialProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CredentialProvider.class);
public CredentialProvider(String masterKey, File masterKeyLocation,
boolean isMasterKeyPersisted, File masterKeyStoreLocation) throws AmbariException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
index e5696cd..bf3ac22 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* This implementation provides kinit functionality and keytab file caching utilities for classes.
*/
abstract class KDCKerberosOperationHandler extends KerberosOperationHandler {
- private static Logger LOG = LoggerFactory.getLogger(KDCKerberosOperationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KDCKerberosOperationHandler.class);
/**
* The FQDN of the host where KDC administration server is
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java
index 510e706..7e5aad1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java
@@ -101,7 +101,7 @@ public class MetricsRetrievalService extends AbstractService {
/**
* Logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(MetricsRetrievalService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MetricsRetrievalService.class);
/**
* The timeout for exceptions which are caught and then cached to prevent log
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java
index c0483e8..b84de01 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java
@@ -53,7 +53,7 @@ public class OsFamily {
private final String OS_VERSION = "versions";
private final String LOAD_CONFIG_MSG = "Could not load OS family definition from %s file";
private final String FILE_NAME = "os_family.json";
- private final Logger LOG = LoggerFactory.getLogger(OsFamily.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OsFamily.class);
private Map<String, JsonOsFamilyEntry> osMap = null;
private JsonOsFamilyRoot jsonOsFamily = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
index 7bd377f..740dd91 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/ClusterConfigurationRequest.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public class ClusterConfigurationRequest {
- protected final static Logger LOG = LoggerFactory.getLogger(ClusterConfigurationRequest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClusterConfigurationRequest.class);
/**
* a regular expression Pattern used to find "clusterHostInfo.(component_name)_host" placeholders in strings
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java
index 12af131..63898ba 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/PersistedStateImpl.java
@@ -63,7 +63,7 @@ import com.google.inject.persist.Transactional;
@Singleton
public class PersistedStateImpl implements PersistedState {
- protected final static Logger LOG = LoggerFactory.getLogger(PersistedState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistedState.class);
@Inject
private TopologyRequestDAO topologyRequestDAO;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/utils/RetryHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/RetryHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/RetryHelper.java
index d732edf..14c276c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/RetryHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/RetryHelper.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* TODO injection as Guice singleon, static for now to avoid major modifications
*/
public class RetryHelper {
- protected final static Logger LOG = LoggerFactory.getLogger(RetryHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RetryHelper.class);
private static Clusters s_clusters;
private static ThreadLocal<Set<Cluster>> affectedClusters = new ThreadLocal<Set<Cluster>>(){
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java
index 55f85a7..9712ca4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java
@@ -37,7 +37,7 @@ public class ViewDataMigrationUtility {
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(ViewDataMigrationUtility.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewDataMigrationUtility.class);
/**
* The View Registry.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java
index ad1cc52..d729942 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java
@@ -52,7 +52,7 @@ public class ViewExtractor {
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(ViewExtractor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewExtractor.class);
// ----- ViewExtractor -----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index c50276e..f071262 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -205,7 +205,7 @@ public class ViewRegistry {
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(ViewRegistry.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewRegistry.class);
/**
* View Data Migration Utility
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
index 5cceb1e..5f6201a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
@@ -47,6 +47,8 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.orm.entities.ViewEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.view.ReadRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An SPI resource provider implementation used to adapt a
@@ -55,6 +57,8 @@ import org.apache.ambari.view.ReadRequest;
*/
public class ViewSubResourceProvider extends AbstractResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ViewSubResourceProvider.class);
+
private static final String VIEW_NAME_PROPERTY_ID = "view_name";
private static final String VIEW_VERSION_PROPERTY_ID = "version";
private static final String INSTANCE_NAME_PROPERTY_ID = "instance_name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java
index 5d4c758..aa48315 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java
@@ -119,7 +119,7 @@ public class DataStoreImpl implements DataStore {
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(DataStoreImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataStoreImpl.class);
/**
* Max length of entity string field.
[2/2] ambari git commit: AMBARI-22426. Push down Logger instances
(adoroszlai)
Posted by ad...@apache.org.
AMBARI-22426. Push down Logger instances (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed7e121f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed7e121f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed7e121f
Branch: refs/heads/trunk
Commit: ed7e121f3aee519ee18e53b4d0b05661cca4b48a
Parents: d0ef144
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon Nov 13 14:01:15 2017 +0100
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Nov 14 18:30:01 2017 +0100
----------------------------------------------------------------------
.../ambari/server/api/handlers/BaseManagementHandler.java | 8 --------
.../org/apache/ambari/server/api/handlers/CreateHandler.java | 4 ++++
.../org/apache/ambari/server/api/services/BaseService.java | 5 +----
.../apache/ambari/server/api/services/LoggingService.java | 4 ++++
.../services/stackadvisor/commands/StackAdvisorCommand.java | 2 +-
.../ambari/server/checks/DatabaseConsistencyCheckHelper.java | 2 +-
.../apache/ambari/server/controller/AmbariHandlerList.java | 5 +----
.../server/controller/internal/AbstractPropertyProvider.java | 4 ++++
.../server/controller/internal/AbstractProviderModule.java | 2 +-
.../server/controller/internal/AbstractResourceProvider.java | 2 +-
.../server/controller/internal/ActionResourceProvider.java | 4 ++++
.../controller/internal/AlertDefinitionResourceProvider.java | 4 ++++
.../controller/internal/AlertGroupResourceProvider.java | 4 ++++
.../server/controller/internal/AlertResourceProvider.java | 4 ++++
.../controller/internal/AlertTargetResourceProvider.java | 4 ++++
.../server/controller/internal/ArtifactResourceProvider.java | 4 ++++
.../ambari/server/controller/internal/BaseProvider.java | 6 +-----
.../controller/internal/BlueprintConfigurationProcessor.java | 2 +-
.../controller/internal/BlueprintResourceProvider.java | 4 ++++
.../server/controller/internal/ClusterResourceProvider.java | 4 ++++
.../internal/ClusterStackVersionResourceProvider.java | 4 ++++
.../CompatibleRepositoryVersionResourceProvider.java | 4 ++++
.../controller/internal/ComponentResourceProvider.java | 4 ++++
.../controller/internal/CredentialResourceProvider.java | 4 ++++
.../server/controller/internal/GroupResourceProvider.java | 4 ++++
.../controller/internal/HostComponentResourceProvider.java | 4 ++++
.../server/controller/internal/HostResourceProvider.java | 2 ++
.../internal/HostStackVersionResourceProvider.java | 4 ++++
.../ambari/server/controller/internal/HostStatusHelper.java | 2 +-
.../server/controller/internal/HttpPropertyProvider.java | 2 +-
.../server/controller/internal/JsonHttpPropertyRequest.java | 2 +-
.../controller/internal/LdapSyncEventResourceProvider.java | 2 +-
.../server/controller/internal/MemberResourceProvider.java | 4 ++++
.../internal/QuickLinkArtifactResourceProvider.java | 4 ++++
.../controller/internal/RecommendationResourceProvider.java | 4 ++++
.../server/controller/internal/RequestResourceProvider.java | 4 ++++
.../internal/RoleAuthorizationResourceProvider.java | 4 ++++
.../server/controller/internal/ServiceResourceProvider.java | 5 +++++
.../controller/internal/StackAdvisorResourceProvider.java | 4 ++++
.../controller/internal/StackArtifactResourceProvider.java | 5 +++++
.../server/controller/internal/StageResourceProvider.java | 4 ++++
.../server/controller/internal/TaskResourceProvider.java | 4 ++++
.../controller/internal/ThemeArtifactResourceProvider.java | 4 ++++
.../controller/internal/UpgradeItemResourceProvider.java | 4 ++++
.../server/controller/internal/UserResourceProvider.java | 4 ++++
.../controller/internal/ValidationResourceProvider.java | 4 ++++
.../internal/VersionDefinitionResourceProvider.java | 4 ++++
.../ambari/server/controller/jdbc/JDBCResourceProvider.java | 2 +-
.../ambari/server/controller/jmx/JMXPropertyProvider.java | 2 +-
.../controller/metrics/MetricsCollectorHAClusterState.java | 2 +-
.../server/controller/metrics/MetricsCollectorHAManager.java | 2 +-
.../server/controller/metrics/MetricsDownsamplingMethod.java | 2 +-
.../server/controller/metrics/MetricsPropertyProvider.java | 2 +-
.../controller/metrics/MetricsReportPropertyProvider.java | 2 +-
.../controller/metrics/RestMetricsPropertyProvider.java | 2 +-
.../metrics/ThreadPoolEnabledPropertyProvider.java | 4 ++++
.../controller/metrics/ganglia/GangliaPropertyProvider.java | 2 +-
.../metrics/ganglia/GangliaReportPropertyProvider.java | 2 +-
.../controller/metrics/timeline/AMSPropertyProvider.java | 3 +++
.../metrics/timeline/AMSReportPropertyProvider.java | 3 +++
.../ambari/server/controller/utilities/DatabaseChecker.java | 2 +-
.../utilities/state/DefaultServiceCalculatedState.java | 2 +-
.../utilities/state/FlumeServiceCalculatedState.java | 4 ++++
.../utilities/state/HBaseServiceCalculatedState.java | 4 ++++
.../utilities/state/HDFSServiceCalculatedState.java | 4 ++++
.../utilities/state/HiveServiceCalculatedState.java | 4 ++++
.../utilities/state/OozieServiceCalculatedState.java | 4 ++++
.../utilities/state/YARNServiceCalculatedState.java | 4 ++++
.../ldap/service/ads/DefaultLdapConnectionConfigService.java | 2 +-
.../server/orm/entities/RemoteAmbariClusterEntity.java | 2 +-
.../authorization/AmbariLdapAuthenticationProvider.java | 2 +-
.../server/security/encryption/CredentialProvider.java | 2 +-
.../serveraction/kerberos/KDCKerberosOperationHandler.java | 2 +-
.../server/state/services/MetricsRetrievalService.java | 2 +-
.../java/org/apache/ambari/server/state/stack/OsFamily.java | 2 +-
.../ambari/server/topology/ClusterConfigurationRequest.java | 2 +-
.../apache/ambari/server/topology/PersistedStateImpl.java | 2 +-
.../java/org/apache/ambari/server/utils/RetryHelper.java | 2 +-
.../apache/ambari/server/view/ViewDataMigrationUtility.java | 2 +-
.../java/org/apache/ambari/server/view/ViewExtractor.java | 2 +-
.../java/org/apache/ambari/server/view/ViewRegistry.java | 2 +-
.../apache/ambari/server/view/ViewSubResourceProvider.java | 4 ++++
.../apache/ambari/server/view/persistence/DataStoreImpl.java | 2 +-
83 files changed, 212 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
index d0bd5d3..1fa55eb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
@@ -36,20 +36,12 @@ import org.apache.ambari.server.controller.spi.RequestStatus;
import org.apache.ambari.server.controller.spi.RequestStatusMetaData;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Base handler for operations that persist state to the back-end.
*/
public abstract class BaseManagementHandler implements RequestHandler {
- /**
- * Logger instance.
- */
- protected final static Logger LOG =
- LoggerFactory.getLogger(BaseManagementHandler.class);
-
public static final String RESOURCES_NODE_NAME = "resources";
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
index 549da76..b614c5e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java
@@ -31,6 +31,8 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.security.authorization.AuthorizationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,6 +40,8 @@ import org.apache.ambari.server.security.authorization.AuthorizationException;
*/
public class CreateHandler extends BaseManagementHandler {
+ private final static Logger LOG = LoggerFactory.getLogger(CreateHandler.class);
+
@Override
protected Result persist(ResourceInstance resource, RequestBody body) {
Result result;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index d24780b..17155a4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -90,10 +90,7 @@ public abstract class BaseService {
static final String FIELDS_SEPARATOR = ", ";
- /**
- * Logger instance.
- */
- protected final static Logger LOG = LoggerFactory.getLogger(BaseService.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BaseService.class);
/**
* Factory for creating resource instances.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
index c86b9a0..e830d3b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
@@ -51,6 +51,8 @@ import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.utils.RetryHelper;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -63,6 +65,8 @@ import com.google.inject.Inject;
*/
public class LoggingService extends BaseService {
+ private final static Logger LOG = LoggerFactory.getLogger(LoggingService.class);
+
/**
* The user of authorizations for which a user must have one of in order to access LogSearch data
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index 2dc45de..91edf86 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
@@ -71,7 +71,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
*/
private Class<T> type;
- protected static Logger LOG = LoggerFactory.getLogger(StackAdvisorCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StackAdvisorCommand.class);
private static final String GET_HOSTS_INFO_URI = "/api/v1/hosts"
+ "?fields=Hosts/*&Hosts/host_name.in(%s)";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 34888f2..669ab81 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -81,7 +81,7 @@ import com.google.inject.persist.Transactional;
public class DatabaseConsistencyCheckHelper {
- static Logger LOG = LoggerFactory.getLogger(DatabaseConsistencyCheckHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DatabaseConsistencyCheckHelper.class);
@Inject
private static Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
index e134f6d..23c9dee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java
@@ -111,10 +111,7 @@ public class AmbariHandlerList extends HandlerCollection implements ViewInstance
*/
private final Collection<Handler> nonViewHandlers = new HashSet<>();
- /**
- * The logger.
- */
- protected final static Logger LOG = LoggerFactory.getLogger(AmbariHandlerList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariHandlerList.class);
// ----- Constructors ------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
index 322596e..05b0eaa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
@@ -45,12 +45,16 @@ import org.apache.ambari.server.security.authorization.AuthorizationHelper;
import org.apache.ambari.server.security.authorization.ResourceType;
import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract property provider implementation.
*/
public abstract class AbstractPropertyProvider extends BaseProvider implements PropertyProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractPropertyProvider.class);
+
/**
* The property/metric information for this provider keyed by component name / property id.
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 1501a01..caa21bc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -267,7 +267,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
private volatile boolean initialized = false;
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(AbstractProviderModule.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
index 5598650..40e1b2d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
@@ -68,7 +68,7 @@ public abstract class AbstractResourceProvider extends BaseProvider implements R
*/
private final Set<ResourceProviderObserver> observers = new HashSet<>();
- protected final static Logger LOG = LoggerFactory.getLogger(AbstractResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractResourceProvider.class);
protected final static String PROPERTIES_ATTRIBUTES_REGEX = "properties_attributes/[a-zA-Z][a-zA-Z._-]*$";
public static Pattern propertiesAttributesPattern = Pattern.compile(".*/" + PROPERTIES_ATTRIBUTES_REGEX);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
index 4e618e7..290931555 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
@@ -43,9 +43,13 @@ 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.customactions.ActionDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ActionResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ActionResourceProvider.class);
+
public static final String ACTION_NAME_PROPERTY_ID = PropertyHelper
.getPropertyId("Actions", "action_name");
public static final String ACTION_TYPE_PROPERTY_ID = PropertyHelper
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
index 32f1fd8..9579dca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
@@ -61,6 +61,8 @@ import org.apache.ambari.server.state.alert.Scope;
import org.apache.ambari.server.state.alert.SourceType;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
@@ -73,6 +75,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class AlertDefinitionResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AlertDefinitionResourceProvider.class);
+
protected static final String ALERT_DEF = "AlertDefinition";
protected static final String ALERT_DEF_CLUSTER_NAME = "AlertDefinition/cluster_name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
index cf4e747..0898bc3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
@@ -49,6 +49,8 @@ import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.alert.AlertTarget;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -61,6 +63,8 @@ import com.google.inject.Inject;
public class AlertGroupResourceProvider extends
AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AlertGroupResourceProvider.class);
+
public static final String ALERT_GROUP = "AlertGroup";
public static final String ALERT_GROUP_ID = "AlertGroup/id";
public static final String ALERT_GROUP_CLUSTER_NAME = "AlertGroup/cluster_name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
index c71651e..4ab78b7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
@@ -50,6 +50,8 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -61,6 +63,8 @@ import com.google.inject.Provider;
public class AlertResourceProvider extends ReadOnlyResourceProvider implements
ExtendedResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AlertResourceProvider.class);
+
public static final String ALERT_ID = "Alert/id";
public static final String ALERT_STATE = "Alert/state";
public static final String ALERT_ORIGINAL_TIMESTAMP = "Alert/original_timestamp";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
index 43ee7fe..c1e9eb4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
@@ -53,6 +53,8 @@ import org.apache.ambari.server.state.AlertState;
import org.apache.ambari.server.state.alert.AlertGroup;
import org.apache.ambari.server.state.alert.AlertTarget;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.inject.Inject;
@@ -67,6 +69,8 @@ import com.google.inject.persist.Transactional;
public class AlertTargetResourceProvider extends
AbstractAuthorizedResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AlertTargetResourceProvider.class);
+
public static final String ALERT_TARGET = "AlertTarget";
public static final String ALERT_TARGET_ID = "AlertTarget/id";
public static final String ALERT_TARGET_NAME = "AlertTarget/name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
index c5c02cf..567cfa9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
@@ -47,6 +47,8 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.orm.dao.ArtifactDAO;
import org.apache.ambari.server.orm.entities.ArtifactEntity;
import org.apache.ambari.server.state.Cluster;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.inject.Inject;
@@ -62,6 +64,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class ArtifactResourceProvider extends AbstractResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ArtifactResourceProvider.class);
+
public static final String RESPONSE_KEY = "Artifacts";
public static final String ARTIFACT_NAME = "artifact_name";
public static final String CLUSTER_NAME = "cluster_name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
index 135eefe..c9fee7d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
@@ -61,11 +61,7 @@ public abstract class BaseProvider {
*/
private final Map<String, Pattern> patterns;
- /**
- * The logger.
- */
- protected final static Logger LOG =
- LoggerFactory.getLogger(BaseProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BaseProvider.class);
/**
* The regex pattern that will match on all $1, $2.method(0), and
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5a7cda0..5b75532 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -67,7 +67,7 @@ import com.google.common.collect.Sets;
*/
public class BlueprintConfigurationProcessor {
- protected final static Logger LOG = LoggerFactory.getLogger(BlueprintConfigurationProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BlueprintConfigurationProcessor.class);
private final static String COMMAND_RETRY_ENABLED_PROPERTY_NAME = "command_retry_enabled";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
index 73d2490..67f5448 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
@@ -60,6 +60,8 @@ import org.apache.ambari.server.topology.InvalidTopologyException;
import org.apache.ambari.server.topology.SecurityConfiguration;
import org.apache.ambari.server.topology.SecurityConfigurationFactory;
import org.apache.ambari.server.utils.SecretReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -71,6 +73,8 @@ import com.google.gson.Gson;
*/
public class BlueprintResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(BlueprintResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Blueprints
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
index 54c8360..b9b3b56 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
@@ -56,6 +56,8 @@ import org.apache.ambari.server.topology.SecurityConfiguration;
import org.apache.ambari.server.topology.SecurityConfigurationFactory;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.topology.TopologyRequestFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
import com.google.gson.Gson;
@@ -66,6 +68,8 @@ import com.google.gson.Gson;
*/
public class ClusterResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ClusterResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Clusters
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 98adcd1..24e4d70 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -88,6 +88,8 @@ import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -103,6 +105,8 @@ import com.google.inject.persist.Transactional;
@StaticallyInject
public class ClusterStackVersionResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ClusterStackVersionResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
protected static final String CLUSTER_STACK_VERSION_ID_PROPERTY_ID = PropertyHelper.getPropertyId("ClusterStackVersions", "id");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
index f05ffbe..fa963c6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
@@ -51,6 +51,8 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.repository.ManifestServiceInfo;
import org.apache.ambari.server.state.repository.VersionDefinitionXml;
import org.apache.ambari.server.state.stack.UpgradePack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
@@ -64,6 +66,8 @@ import com.google.inject.Provider;
@StaticallyInject
public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(CompatibleRepositoryVersionResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
public static final String REPOSITORY_VERSION_ID_PROPERTY_ID = "CompatibleRepositoryVersions/id";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index 2e86b2d..482e5d2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -62,6 +62,8 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import com.google.inject.assistedinject.Assisted;
@@ -73,6 +75,8 @@ import com.google.inject.persist.Transactional;
*/
public class ComponentResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ComponentResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Components
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
index 79254c6..ebc7645 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
@@ -45,6 +45,8 @@ import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.ambari.server.security.encryption.CredentialStoreService;
import org.apache.ambari.server.security.encryption.CredentialStoreType;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
@@ -56,6 +58,8 @@ import com.google.inject.assistedinject.AssistedInject;
@StaticallyInject
public class CredentialResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(CredentialResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
public static final String CREDENTIAL_CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("Credential", "cluster_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
index f051651..6cdd24e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
@@ -38,12 +38,16 @@ 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.security.authorization.RoleAuthorization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Resource provider for group resources.
*/
public class GroupResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(GroupResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Groups
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 6708560..94766a5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -66,6 +66,8 @@ import org.apache.ambari.server.state.svccomphost.ServiceComponentHostDisableEve
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostRestoreEvent;
import org.apache.ambari.server.topology.Setting;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -77,6 +79,8 @@ import com.google.inject.assistedinject.AssistedInject;
*/
public class HostComponentResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(HostComponentResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Host Components
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index 5373ffe..2b18eb2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -85,6 +85,8 @@ import com.google.inject.persist.Transactional;
*/
public class HostResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(HostResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Hosts
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index b106209..62fb530 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -65,6 +65,8 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
@@ -76,6 +78,8 @@ import com.google.inject.Provider;
@StaticallyInject
public class HostStackVersionResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(HostStackVersionResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
protected static final String HOST_STACK_VERSION_ID_PROPERTY_ID = PropertyHelper.getPropertyId("HostStackVersions", "id");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStatusHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStatusHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStatusHelper.java
index f94b979..44d3110 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStatusHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStatusHelper.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class HostStatusHelper {
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(HostStatusHelper.class);
public static boolean isHostComponentLive(AmbariManagementController managementController,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpPropertyProvider.java
index c556b06..cb7afcd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpPropertyProvider.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*/
public class HttpPropertyProvider extends BaseProvider implements PropertyProvider {
- protected final static Logger LOG = LoggerFactory.getLogger(HttpPropertyProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HttpPropertyProvider.class);
private final StreamProvider streamProvider;
private final String clusterNamePropertyId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JsonHttpPropertyRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JsonHttpPropertyRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JsonHttpPropertyRequest.java
index 2e51e8c..7fea2ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JsonHttpPropertyRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JsonHttpPropertyRequest.java
@@ -37,7 +37,7 @@ import com.google.gson.reflect.TypeToken;
* instance.
*/
public abstract class JsonHttpPropertyRequest extends HttpPropertyProvider.HttpPropertyRequest {
- protected final static Logger LOG = LoggerFactory.getLogger(JsonHttpPropertyRequest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JsonHttpPropertyRequest.class);
private static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {}.getType();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
index 4badc9c..fc409a3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
@@ -155,7 +155,7 @@ public class LdapSyncEventResourceProvider extends AbstractControllerResourcePro
/**
* The logger.
*/
- protected final static Logger LOG = LoggerFactory.getLogger(LdapSyncEventResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LdapSyncEventResourceProvider.class);
// ----- Constructors ------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
index d9d56ee..3cecddb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
@@ -39,6 +39,8 @@ 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.security.authorization.RoleAuthorization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@@ -49,6 +51,8 @@ import com.google.inject.persist.Transactional;
*/
public class MemberResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(MemberResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Members
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
index 073ec60..f293941 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
@@ -44,9 +44,13 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.quicklinks.Link;
import org.apache.ambari.server.state.quicklinks.QuickLinks;
import org.apache.ambari.server.state.quicklinksprofile.QuickLinkVisibilityController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class QuickLinkArtifactResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(QuickLinkArtifactResourceProvider.class);
+
public static final String STACK_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("QuickLinkInfo", "stack_name");
public static final String STACK_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId("QuickLinkInfo", "stack_version");
public static final String STACK_SERVICE_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("QuickLinkInfo", "service_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
index 70ed3dc..9c6259c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
@@ -43,9 +43,13 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RecommendationResourceProvider extends StackAdvisorResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(RecommendationResourceProvider.class);
+
protected static final String RECOMMENDATION_ID_PROPERTY_ID = PropertyHelper.getPropertyId(
"Recommendation", "id");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
index 81f283c..26e3b86 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
@@ -71,6 +71,8 @@ import org.apache.ambari.server.topology.LogicalRequest;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.SecretReference;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
@@ -81,6 +83,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class RequestResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(RequestResourceProvider.class);
+
@Inject
private static RequestDAO s_requestDAO = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java
index 78eb80e..8dbe2bf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java
@@ -42,6 +42,8 @@ import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
import org.apache.ambari.server.orm.entities.PermissionEntity;
import org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -51,6 +53,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class RoleAuthorizationResourceProvider extends ReadOnlyResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(RoleAuthorizationResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
public static final String AUTHORIZATION_ID_PROPERTY_ID = PropertyHelper.getPropertyId("AuthorizationInfo", "authorization_id");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index e55a380..9b12f03 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -78,6 +78,8 @@ import org.apache.ambari.server.state.State;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
@@ -87,6 +89,9 @@ import com.google.inject.assistedinject.AssistedInject;
* Resource provider for service resources.
*/
public class ServiceResourceProvider extends AbstractControllerResourceProvider {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceResourceProvider.class);
+
public static final String SERVICE_CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId(
"ServiceInfo", "cluster_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index 7035f0a..1ea664c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
@@ -41,6 +41,8 @@ import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.state.ChangedConfigInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -49,6 +51,8 @@ import com.google.inject.Inject;
*/
public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(StackAdvisorResourceProvider.class);
+
protected static final String STACK_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("Versions",
"stack_name");
protected static final String STACK_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId(
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index 6bb421b..d042f86 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
@@ -56,6 +56,8 @@ import org.apache.ambari.server.state.stack.Metric;
import org.apache.ambari.server.state.stack.MetricDefinition;
import org.apache.ambari.server.state.stack.WidgetLayout;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -73,6 +75,9 @@ import com.google.inject.Inject;
*/
@StaticallyInject
public class StackArtifactResourceProvider extends AbstractControllerResourceProvider {
+
+ private static final Logger LOG = LoggerFactory.getLogger(StackArtifactResourceProvider.class);
+
/**
* stack name
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index 6a326b5..c4251c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
@@ -56,6 +56,8 @@ import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.SecretReference;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
@@ -65,6 +67,8 @@ import com.google.common.collect.Sets;
@StaticallyInject
public class StageResourceProvider extends AbstractControllerResourceProvider implements ExtendedResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(StageResourceProvider.class);
+
/**
* Used for querying stage resources.
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
index 0b4fcd9..39419ec 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
@@ -44,6 +44,8 @@ import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.StageUtils;
import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -53,6 +55,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class TaskResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(TaskResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Tasks
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
index fc7cfe7..affd969 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
@@ -41,9 +41,13 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.ThemeInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ThemeArtifactResourceProvider extends AbstractControllerResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ThemeArtifactResourceProvider.class);
+
public static final String STACK_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("ThemeInfo", "stack_name");
public static final String STACK_VERSION_PROPERTY_ID = PropertyHelper.getPropertyId("ThemeInfo", "stack_version");
public static final String STACK_SERVICE_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("ThemeInfo", "service_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
index 36eb3be..93b3e46 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
@@ -57,6 +57,8 @@ import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.utils.SecretReference;
import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -66,6 +68,8 @@ import com.google.inject.Inject;
@StaticallyInject
public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeItemResourceProvider.class);
+
public static final String UPGRADE_CLUSTER_NAME = "UpgradeItem/cluster_name";
public static final String UPGRADE_REQUEST_ID = "UpgradeItem/request_id";
public static final String UPGRADE_GROUP_ID = "UpgradeItem/group_id";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
index c5c36e9..698f419 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
@@ -41,12 +41,16 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.apache.ambari.server.security.authorization.RoleAuthorization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Resource provider for user resources.
*/
public class UserResourceProvider extends AbstractControllerResourceProvider implements ResourcePredicateEvaluator {
+ private static final Logger LOG = LoggerFactory.getLogger(UserResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
// Users
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
index b78c64a..5448784 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
@@ -42,9 +42,13 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ValidationResourceProvider extends StackAdvisorResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ValidationResourceProvider.class);
+
protected static final String VALIDATION_ID_PROPERTY_ID = PropertyHelper.getPropertyId(
"Validation", "id");
protected static final String VALIDATE_PROPERTY_ID = "validate";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index f94ac32..b8c956f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -71,6 +71,8 @@ import org.apache.commons.lang.math.NumberUtils;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
@@ -86,6 +88,8 @@ import com.google.inject.Provider;
@StaticallyInject
public class VersionDefinitionResourceProvider extends AbstractAuthorizedResourceProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(VersionDefinitionResourceProvider.class);
+
public static final String VERSION_DEF = "VersionDefinition";
public static final String VERSION_DEF_BASE64_PROPERTY = "version_base64";
public static final String VERSION_DEF_STACK_NAME = "VersionDefinition/stack_name";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
index ec5363b..8bcbce4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
@@ -70,7 +70,7 @@ public class JDBCResourceProvider extends BaseProvider implements ResourceProvid
*/
private final Map<String, Map<String, String>> importedKeys = new HashMap<>();
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(JDBCResourceProvider.class);
public JDBCResourceProvider(ConnectionFactory connectionFactory,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
index 832d9ae..c22f90e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
@@ -116,7 +116,7 @@ public class JMXPropertyProvider extends ThreadPoolEnabledPropertyProvider {
"/jmx?get=Hadoop:service=NameNode,name=FSNamesystem::tag.HAState"));
}
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(JMXPropertyProvider.class);
private static final Pattern dotReplacementCharPattern =
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAClusterState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAClusterState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAClusterState.java
index 9ff40b4..231d103 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAClusterState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAClusterState.java
@@ -47,7 +47,7 @@ public class MetricsCollectorHAClusterState {
@Inject
AmbariManagementController managementController;
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(MetricsCollectorHAClusterState.class);
public MetricsCollectorHAClusterState(String clusterName) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAManager.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAManager.java
index f107aab..d4b5dae 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsCollectorHAManager.java
@@ -38,7 +38,7 @@ public class MetricsCollectorHAManager {
protected AmbariEventPublisher eventPublisher;
private Map<String, MetricsCollectorHAClusterState> clusterCollectorHAState;
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(MetricsCollectorHAManager.class);
public MetricsCollectorHAManager() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethod.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethod.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethod.java
index 5994f16..8059560 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethod.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsDownsamplingMethod.java
@@ -26,7 +26,7 @@ public abstract class MetricsDownsamplingMethod {
// Allow for 2 minute discrepancy to account for client side buffering,
// this ensures at least some data is returned in the initial few minutes.
private static final long OUT_OF_BAND_TIME_ALLOWANCE = 120000;
- static Logger LOG = LoggerFactory.getLogger(MetricsDownsamplingMethod.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MetricsDownsamplingMethod.class);
// Downsampling methods iterate over the entire metrics result to create output array.
// Passing down @TemporalInfo avoids re-iterating to filter out out of band data.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPropertyProvider.java
index 04f8c78..d5d4368 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsPropertyProvider.java
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class MetricsPropertyProvider extends AbstractPropertyProvider {
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(MetricsPropertyProvider.class);
protected static final Pattern questionMarkPattern = Pattern.compile("\\?");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsReportPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsReportPropertyProvider.java
index a11bcc9..46bc26b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/MetricsReportPropertyProvider.java
@@ -43,7 +43,7 @@ public abstract class MetricsReportPropertyProvider extends AbstractPropertyProv
// ----- Constants --------------------------------------------------------
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(MetricsReportPropertyProvider.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
index 7ab16da..e2f0906 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProvider.java
@@ -70,7 +70,7 @@ import com.google.inject.assistedinject.AssistedInject;
*/
public class RestMetricsPropertyProvider extends ThreadPoolEnabledPropertyProvider {
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(RestMetricsPropertyProvider.class);
@Inject
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
index a2f7248..d571dae 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
@@ -41,6 +41,8 @@ import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.utilities.BufferedThreadPoolExecutorCompletionService;
import org.apache.ambari.server.controller.utilities.ScalingThreadPoolExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.cache.Cache;
@@ -75,6 +77,8 @@ import com.google.inject.Inject;
*/
public abstract class ThreadPoolEnabledPropertyProvider extends AbstractPropertyProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolEnabledPropertyProvider.class);
+
protected static Configuration configuration;
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
index ecfd400..ac0c590 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
@@ -77,7 +77,7 @@ public abstract class GangliaPropertyProvider extends MetricsPropertyProvider {
GANGLIA_CLUSTER_NAME_MAP.put("SUPERVISOR", Collections.singletonList("HDPSupervisor"));
}
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(GangliaPropertyProvider.class);
// ----- Constructors ------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
index f15615b..02ea9f3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
public class GangliaReportPropertyProvider extends MetricsReportPropertyProvider {
// ----- Constants --------------------------------------------------------
- protected final static Logger LOG =
+ private static final Logger LOG =
LoggerFactory.getLogger(GangliaReportPropertyProvider.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index cae330b..3d4ad2c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -66,10 +66,13 @@ import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AMSPropertyProvider.class);
private static final String METRIC_REGEXP_PATTERN = "\\([^)]*\\)";
private static final int COLLECTOR_DEFAULT_PORT = 6188;
private final TimelineMetricCache metricCache;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
index 74df3a7..d86a671 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
@@ -51,8 +51,11 @@ import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AMSReportPropertyProvider extends MetricsReportPropertyProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(AMSReportPropertyProvider.class);
private MetricsPaddingMethod metricsPaddingMethod;
private final TimelineMetricCache metricCache;
MetricsRequestHelper requestHelper;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
index 95352bf..8643fc8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/DatabaseChecker.java
@@ -58,7 +58,7 @@ import com.google.inject.Injector;
* now we will use DatabaseConsistencyChecker*/
public class DatabaseChecker {
- static Logger LOG = LoggerFactory.getLogger(DatabaseChecker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DatabaseChecker.class);
@Inject
static Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7e121f/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
index 5e02a64..ab07a08 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
@@ -55,7 +55,7 @@ import com.google.inject.Provider;
@StaticallyInject
public class DefaultServiceCalculatedState implements ServiceCalculatedState {
- protected final static Logger LOG = LoggerFactory.getLogger(DefaultServiceCalculatedState.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultServiceCalculatedState.class);
@Inject
protected static Provider<Clusters> clustersProvider = null;