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/06/12 10:11:28 UTC
[1/4] ambari git commit: AMBARI-19149. Code cleanup: concatenation in
debug messages, unnecessary toString calls
Repository: ambari
Updated Branches:
refs/heads/trunk d5105226b -> 219f22345
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
index cda9ab0..93ae810 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/StackRoleCommandOrder.java
@@ -161,7 +161,7 @@ public class StackRoleCommandOrder {
}
depValue = buffer.toString();
}
- LOG.debug(depKey + " => " + depValue);
+ LOG.debug("{} => {}", depKey, depValue);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
index b8e57c7..8662958 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/UpgradePack.java
@@ -54,7 +54,7 @@ public class UpgradePack {
private static final String ALL_VERSIONS = "*";
- private static Logger LOG = LoggerFactory.getLogger(UpgradePack.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradePack.class);
/**
* Name of the file without the extension, such as upgrade-2.2
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java
index b19d72d..18f8cce 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java
@@ -54,7 +54,7 @@ import com.google.gson.JsonPrimitive;
@XmlType(name="colocated")
public class ColocatedGrouping extends Grouping {
- private static Logger LOG = LoggerFactory.getLogger(ColocatedGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ColocatedGrouping.class);
@XmlElement(name="batch")
public Batch batch;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
index 452b66a..89b6567 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
@@ -82,7 +82,7 @@ import com.google.common.base.Objects;
@XmlAccessorType(XmlAccessType.FIELD)
public class ConfigUpgradeChangeDefinition {
- private static Logger LOG = LoggerFactory.getLogger(ConfigUpgradeChangeDefinition.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigUpgradeChangeDefinition.class);
/**
* The key that represents the configuration type to change (ie hdfs-site).
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
index 58d63b3..68dc63f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java
@@ -60,7 +60,7 @@ import com.google.gson.Gson;
@XmlType(name="configure")
public class ConfigureTask extends ServerSideActionTask {
- private static Logger LOG = LoggerFactory.getLogger(ConfigureTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigureTask.class);
/**
* The key that represents the configuration type to change (ie hdfs-site).
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
index 4d5003f..dd2dd02 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java
@@ -56,7 +56,7 @@ import com.google.gson.JsonObject;
public class HostOrderGrouping extends Grouping {
private static final String TYPE = "type";
private static final String HOST = "host";
- private static Logger LOG = LoggerFactory.getLogger(HostOrderGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HostOrderGrouping.class);
/**
* Contains the ordered actions to schedule for this grouping.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java
index 0e3b4af..6ad7531 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RestartGrouping.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
@XmlType(name="restart")
public class RestartGrouping extends Grouping implements UpgradeFunction {
- private static Logger LOG = LoggerFactory.getLogger(RestartGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestartGrouping.class);
@Override
public Task.Type getFunction() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
index ef1d0c3..61a387f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
@XmlType(name="service-check")
public class ServiceCheckGrouping extends Grouping {
- private static Logger LOG = LoggerFactory.getLogger(ServiceCheckGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceCheckGrouping.class);
/**
* During a Rolling Upgrade, the priority services are ran first, then the remaining services in the cluster.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java
index d27e6d8..9a22789 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StartGrouping.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
@XmlType(name="start")
public class StartGrouping extends Grouping implements UpgradeFunction {
- private static Logger LOG = LoggerFactory.getLogger(StartGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StartGrouping.class);
@Override
public Task.Type getFunction() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java
index 44996c8..9a0d956 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StopGrouping.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
@XmlType(name="stop")
public class StopGrouping extends Grouping implements UpgradeFunction {
- private static Logger LOG = LoggerFactory.getLogger(StopGrouping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StopGrouping.class);
@Override
public Task.Type getFunction() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
index 98e8736..23f2557 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapperBuilder.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public class TaskWrapperBuilder {
- private static Logger LOG = LoggerFactory.getLogger(TaskWrapperBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskWrapperBuilder.class);
/**
* Creates a collection of task wrappers based on the set of hosts they are allowed to run on
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
index 9704dc5..f9d3cfc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
@@ -690,8 +690,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
ServiceComponentHostInstallEvent e =
(ServiceComponentHostInstallEvent) event;
if (LOG.isDebugEnabled()) {
- LOG.debug("Updating live stack version during INSTALL event"
- + ", new stack version=" + e.getStackId());
+ LOG.debug("Updating live stack version during INSTALL event, new stack version={}", e.getStackId());
}
}
}
@@ -1011,9 +1010,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
public void handleEvent(ServiceComponentHostEvent event)
throws InvalidStateTransitionException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling ServiceComponentHostEvent event,"
- + " eventType=" + event.getType().name()
- + ", event=" + event.toString());
+ LOG.debug("Handling ServiceComponentHostEvent event, eventType={}, event={}", event.getType().name(), event);
}
State oldState = getState();
try {
@@ -1045,13 +1042,8 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
+ ", oldState=" + oldState
+ ", currentState=" + getState());
if (LOG.isDebugEnabled()) {
- LOG.debug("ServiceComponentHost transitioned to a new state"
- + ", serviceComponentName=" + getServiceComponentName()
- + ", hostName=" + getHostName()
- + ", oldState=" + oldState
- + ", currentState=" + getState()
- + ", eventType=" + event.getType().name()
- + ", event=" + event);
+ LOG.debug("ServiceComponentHost transitioned to a new state, serviceComponentName={}, hostName={}, oldState={}, currentState={}, eventType={}, event={}",
+ getServiceComponentName(), getHostName(), oldState, getState(), event.getType().name(), event);
}
}
}
@@ -1393,7 +1385,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
Long groupId = Long.parseLong(overrideEntry.getKey());
hc.getConfigGroupOverrides().put(groupId, overrideEntry.getValue());
if (!configGroupMap.containsKey(groupId)) {
- LOG.debug("Config group does not exist, id = " + groupId);
+ LOG.debug("Config group does not exist, id = {}", groupId);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
index 4030e3a..1a43b85 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
@@ -110,7 +110,7 @@ public class BlueprintValidatorImpl implements BlueprintValidator {
}
if (containsSecretReferences) {
throw new InvalidTopologyException("Secret references are not allowed in blueprints, " +
- "replace following properties with real passwords:\n" + errorMessage.toString());
+ "replace following properties with real passwords:\n" + errorMessage);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/ConfigureClusterTask.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/ConfigureClusterTask.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/ConfigureClusterTask.java
index 19d99ad..0ce5982 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/ConfigureClusterTask.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/ConfigureClusterTask.java
@@ -35,7 +35,7 @@ import com.google.inject.assistedinject.AssistedInject;
public class ConfigureClusterTask implements Callable<Boolean> {
- private static Logger LOG = LoggerFactory.getLogger(ConfigureClusterTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigureClusterTask.class);
private ClusterConfigurationRequest configRequest;
private ClusterTopology topology;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java
index 82a2f6e..e016ec8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java
@@ -28,7 +28,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
public abstract class TopologyHostTask implements TopologyTask {
- private static Logger LOG = LoggerFactory.getLogger(TopologyHostTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TopologyHostTask.class);
ClusterTopology clusterTopology;
HostRequest hostRequest;
@@ -56,4 +56,4 @@ public abstract class TopologyHostTask implements TopologyTask {
public abstract void runTask();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidator.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidator.java
index dce38b4..0170186 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidator.java
@@ -59,7 +59,7 @@ public class ClusterConfigTypeValidator implements TopologyValidator {
invalidConfigTypes.removeAll(configTypeIntersection);
LOGGER.error("The following config typess are wrong: {}", invalidConfigTypes);
- throw new InvalidTopologyException("The following configuration types are invalid: " + invalidConfigTypes.toString());
+ throw new InvalidTopologyException("The following configuration types are invalid: " + invalidConfigTypes);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 3f15400..1d277a7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -1120,7 +1120,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
}
}
if (widgetDescriptor != null) {
- LOG.debug("Loaded widget descriptor: " + widgetDescriptor);
+ LOG.debug("Loaded widget descriptor: {}", widgetDescriptor);
for (Object artifact : widgetDescriptor.values()) {
List<WidgetLayout> widgetLayouts = (List<WidgetLayout>) artifact;
for (WidgetLayout widgetLayout : widgetLayouts) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index 48cf5f6..dee05c3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -403,7 +403,7 @@ public class SchemaUpgradeHelper {
UpgradeCatalog targetUpgradeCatalog = AbstractUpgradeCatalog
.getUpgradeCatalog(targetVersion);
- LOG.debug("Target upgrade catalog. " + targetUpgradeCatalog);
+ LOG.debug("Target upgrade catalog. {}", targetUpgradeCatalog);
// Read source version from DB
String sourceVersion = schemaUpgradeHelper.readSourceVersion();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index 9632cd1..cc7dcb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -647,7 +647,7 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog {
}
}
if (widgetDescriptor != null) {
- LOG.debug("Loaded widget descriptor: " + widgetDescriptor);
+ LOG.debug("Loaded widget descriptor: {}", widgetDescriptor);
for (Object artifact : widgetDescriptor.values()) {
List<WidgetLayout> widgetLayouts = (List<WidgetLayout>) artifact;
for (WidgetLayout widgetLayout : widgetLayouts) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 1f3a99d..aed4adf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -328,7 +328,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
clusterID, "storm_webui");
if (stormServerProcessDefinitionEntity != null) {
- LOG.info("Removing alert definition : " + stormServerProcessDefinitionEntity.toString());
+ LOG.info("Removing alert definition : " + stormServerProcessDefinitionEntity);
alertDefinitionDAO.remove(stormServerProcessDefinitionEntity);
}
@@ -336,7 +336,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
LOG.info("Updating alert definition : " + stormWebAlert.getDefinitionName());
String source = stormWebAlert.getSource();
JsonObject sourceJson = new JsonParser().parse(source).getAsJsonObject();
- LOG.debug("Source before update : " + sourceJson);
+ LOG.debug("Source before update : {}", sourceJson);
JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
uriJson.remove("https");
@@ -346,7 +346,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
uriJson.addProperty("https_property", "{{storm-site/ui.https.keystore.type}}");
uriJson.addProperty("https_property_value", "jks");
- LOG.debug("Source after update : " + sourceJson);
+ LOG.debug("Source after update : {}", sourceJson);
stormWebAlert.setSource(sourceJson.toString());
alertDefinitionDAO.merge(stormWebAlert);
}
@@ -370,7 +370,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
LOG.info("Updating alert definition : " + logSearchWebAlert.getDefinitionName());
String source = logSearchWebAlert.getSource();
JsonObject sourceJson = new JsonParser().parse(source).getAsJsonObject();
- LOG.debug("Source before update : " + sourceJson);
+ LOG.debug("Source before update : {}", sourceJson);
JsonObject uriJson = sourceJson.get("uri").getAsJsonObject();
uriJson.remove("https_property");
@@ -378,7 +378,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
uriJson.addProperty("https_property", "{{logsearch-env/logsearch_ui_protocol}}");
uriJson.addProperty("https_property_value", "https");
- LOG.debug("Source after update : " + sourceJson);
+ LOG.debug("Source after update : {}", sourceJson);
logSearchWebAlert.setSource(sourceJson.toString());
alertDefinitionDAO.merge(logSearchWebAlert);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/utils/AmbariPath.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/AmbariPath.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/AmbariPath.java
index 790e0be..4e1d904 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/AmbariPath.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/AmbariPath.java
@@ -22,7 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AmbariPath {
- private static Logger LOG = LoggerFactory.getLogger(AmbariPath.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariPath.class);
public static final String AMBARI_SERVER_ROOT_ENV_VARIABLE = "ROOT";
public static final String rootDirectory = System.getenv(AMBARI_SERVER_ROOT_ENV_VARIABLE);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/utils/CommandUtils.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/CommandUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/CommandUtils.java
index 296e4d0..af3171d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/CommandUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/CommandUtils.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CommandUtils {
- private static Logger LOG = LoggerFactory.getLogger(CommandUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CommandUtils.class);
/**
* Converts a collection of commands to {@code}Map{@code} from command.taskId to command.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/utils/SecretReference.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/SecretReference.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/SecretReference.java
index 2ab9ac5..dfd925d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/SecretReference.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/SecretReference.java
@@ -85,7 +85,7 @@ public class SecretReference {
}
public static String generateStub(String configType, Long configVersion, String propertyName) {
- return secretPrefix + ":" + configType + ":" + configVersion.toString() + ":" + propertyName;
+ return secretPrefix + ":" + configType + ":" + configVersion + ":" + propertyName;
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
index 4fcad3d..f6967a0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/ShellCommandUtil.java
@@ -28,15 +28,15 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Logs OpenSsl command exit code with description
*/
public class ShellCommandUtil {
- private static final Log LOG = LogFactory.getLog(ShellCommandUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ShellCommandUtil.class);
private static final Object WindowsProcessLaunchLock = new Object();
private static final String PASS_TOKEN = "pass:";
private static final String KEY_TOKEN = "-key ";
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
index 1d21ccd..9930148 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
@@ -56,12 +56,12 @@ import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
@@ -74,7 +74,7 @@ public class StageUtils {
public static final String DEFAULT_RACK = "/default-rack";
public static final String DEFAULT_IPV4_ADDRESS = "127.0.0.1";
- private static final Log LOG = LogFactory.getLog(StageUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StageUtils.class);
protected static final String AMBARI_SERVER_HOST = "ambari_server_host";
protected static final String AMBARI_SERVER_PORT = "ambari_server_port";
protected static final String AMBARI_SERVER_USE_SSL = "ambari_server_use_ssl";
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
index fc3f1d0..7e67891 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
@@ -45,7 +45,7 @@ public class HttpImpersonatorImpl implements HttpImpersonator {
private ViewContext context;
private final URLStreamProvider urlStreamProvider;
- private static Logger LOG = LoggerFactory.getLogger(HttpImpersonatorImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HttpImpersonatorImpl.class);
public HttpImpersonatorImpl(ViewContext c) {
this.context = c;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java
index dfa937e..836796a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java
@@ -55,7 +55,7 @@ public class ViewAmbariStreamProvider implements AmbariStreamProvider {
*/
private final AmbariManagementController controller;
- private static Logger LOG = LoggerFactory.getLogger(ViewAmbariStreamProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewAmbariStreamProvider.class);
// ----- Constructor -----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
index b62f433..f6a8789 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
@@ -54,14 +54,14 @@ import org.apache.ambari.view.ViewInstanceDefinition;
import org.apache.ambari.view.cluster.Cluster;
import org.apache.ambari.view.events.Event;
import org.apache.ambari.view.events.Listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.directory.api.util.Strings;
import org.apache.hadoop.security.authentication.util.KerberosName;
import org.apache.hadoop.security.authentication.util.KerberosUtil;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.exception.ParseErrorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -75,7 +75,7 @@ public class ViewContextImpl implements ViewContext, ViewController {
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(ViewContextImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewContextImpl.class);
public static final String HADOOP_SECURITY_AUTH_TO_LOCAL = "hadoop.security.auth_to_local";
public static final String CORE_SITE = "core-site";
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java
index 0432265..a13b01e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java
@@ -34,8 +34,8 @@ import org.apache.ambari.view.PersistenceException;
import org.apache.ambari.view.migration.EntityConverter;
import org.apache.ambari.view.migration.ViewDataMigrationContext;
import org.apache.ambari.view.migration.ViewDataMigrationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import com.google.inject.Guice;
@@ -50,7 +50,7 @@ public class ViewDataMigrationContextImpl implements ViewDataMigrationContext {
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(ViewDataMigrationContextImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewDataMigrationContextImpl.class);
/**
* The data store of origin(source) view instance with source data.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 0c827fe..55f85a7 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
@@ -85,12 +85,12 @@ public class ViewDataMigrationUtility {
Map<String, Class> originClasses = migrationContext.getOriginEntityClasses();
Map<String, Class> currentClasses = migrationContext.getCurrentEntityClasses();
for (Map.Entry<String, Class> originEntity : originClasses.entrySet()) {
- LOG.debug("Migrating persistence entity " + originEntity.getKey());
+ LOG.debug("Migrating persistence entity {}", originEntity.getKey());
if (currentClasses.containsKey(originEntity.getKey())) {
Class entity = currentClasses.get(originEntity.getKey());
dataMigrator.migrateEntity(originEntity.getValue(), entity);
} else {
- LOG.debug("Entity " + originEntity.getKey() + " not found in target view");
+ LOG.debug("Entity {} not found in target view", originEntity.getKey());
dataMigrator.migrateEntity(originEntity.getValue(), null);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
index 717bc65..a1b984b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
@@ -40,8 +40,8 @@ import javax.annotation.Nullable;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.utils.Closeables;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
@@ -68,7 +68,7 @@ public class ViewDirectoryWatcher implements DirectoryWatcher {
private Future<?> watchTask;
- private static Log LOG = LogFactory.getLog(ViewDirectoryWatcher.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewDirectoryWatcher.class);
// Callbacks to hook into file processing
private List<Function<Path, Boolean>> hooks = Lists.newArrayList(Collections.singleton(loggingHook()));
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 825a6c5..ad1cc52 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
@@ -108,13 +108,13 @@ public class ViewExtractor {
try {
String entryPath = archivePath + File.separator + jarEntry.getName();
- LOG.debug("Extracting " + entryPath);
+ LOG.debug("Extracting {}", entryPath);
File entryFile = archiveUtility.getFile(entryPath);
if (jarEntry.isDirectory()) {
- LOG.debug("Making directory " + entryPath);
+ LOG.debug("Making directory {}", entryPath);
if (!entryFile.mkdir()) {
msg = "Could not create archive entry directory " + entryPath + ".";
@@ -127,14 +127,14 @@ public class ViewExtractor {
FileOutputStream fos = archiveUtility.getFileOutputStream(entryFile);
try {
- LOG.debug("Begin copying from " + jarEntry.getName() + " to "+ entryPath);
+ LOG.debug("Begin copying from {} to {}", jarEntry.getName(), entryPath);
byte[] buffer = new byte[BUFFER_SIZE];
int n;
while((n = jarInputStream.read(buffer)) > -1) {
fos.write(buffer, 0, n);
}
- LOG.debug("Finish copying from " + jarEntry.getName() + " to "+ entryPath);
+ LOG.debug("Finish copying from {} to {}", jarEntry.getName(), entryPath);
} finally {
fos.flush();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 89b784f..c50276e 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
@@ -578,8 +578,7 @@ public class ViewRegistry {
if (getInstanceDefinition(viewName, version, instanceName) == null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating view instance " + viewName + "/" +
- version + "/" + instanceName);
+ LOG.debug("Creating view instance {}/{}/{}", viewName, version, instanceName);
}
instanceEntity.validate(viewEntity, Validator.ValidationContext.PRE_CREATE);
@@ -706,8 +705,7 @@ public class ViewRegistry {
@Transactional
public void copyPrivileges(ViewInstanceEntity sourceInstanceEntity,
ViewInstanceEntity targetInstanceEntity) {
- LOG.debug("Copy all privileges from " + sourceInstanceEntity.getName() + " to " +
- targetInstanceEntity.getName());
+ LOG.debug("Copy all privileges from {} to {}", sourceInstanceEntity.getName(), targetInstanceEntity.getName());
List<PrivilegeEntity> targetInstancePrivileges = privilegeDAO.findByResourceId(targetInstanceEntity.getResource().getId());
if (targetInstancePrivileges.size() > 0) {
LOG.warn("Target instance {} already has privileges assigned, these will not be deleted. Manual clean up may be needed", targetInstanceEntity.getName());
@@ -1496,13 +1494,13 @@ public class ViewRegistry {
ViewEntity persistedView = viewDAO.findByName(viewName);
if (LOG.isDebugEnabled()) {
- LOG.debug("Syncing view " + viewName + ".");
+ LOG.debug("Syncing view {}.", viewName);
}
// if the view is not yet persisted ...
if (persistedView == null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating view " + viewName + ".");
+ LOG.debug("Creating view {}.", viewName);
}
// create an admin resource type to represent this view
@@ -1543,7 +1541,7 @@ public class ViewRegistry {
}
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Syncing view " + viewName + " complete.");
+ LOG.debug("Syncing view {} complete.", viewName);
}
}
@@ -1852,14 +1850,13 @@ public class ViewRegistry {
private void migrateDataFromPreviousVersion(ViewEntity viewDefinition, String serverVersion) {
if (!viewDefinitions.containsKey(viewDefinition.getName())) { // migrate only registered views to avoid recursive calls
- LOG.debug("Cancel auto migration of not loaded view: " + viewDefinition.getName() + ".");
+ LOG.debug("Cancel auto migration of not loaded view: {}.", viewDefinition.getName());
return;
}
try {
for (ViewInstanceEntity instance : viewDefinition.getInstances()) {
- LOG.debug("Try to migrate the data from previous version of: " + viewDefinition.getName() + "/" +
- instance.getInstanceName() + ".");
+ LOG.debug("Try to migrate the data from previous version of: {}/{}.", viewDefinition.getName(), instance.getInstanceName());
ViewInstanceEntity latestUnregisteredView = getLatestUnregisteredInstance(serverVersion, instance);
if (latestUnregisteredView != null) {
@@ -2246,12 +2243,12 @@ public class ViewRegistry {
continue;
}
- LOG.debug("Unregistered extracted view found: " + archiveDir.getPath());
+ LOG.debug("Unregistered extracted view found: {}", archiveDir.getPath());
ViewEntity uViewDefinition = new ViewEntity(uViewConfig, configuration, archiveDir.getPath());
readViewArchive(uViewDefinition, archiveDir, archiveDir, serverVersion);
for (ViewInstanceEntity instanceEntity : uViewDefinition.getInstances()) {
- LOG.debug(uViewDefinition.getName() + " instance found: " + instanceEntity.getInstanceName());
+ LOG.debug("{} instance found: {}", uViewDefinition.getName(), instanceEntity.getInstanceName());
unregInstancesTimestamps.put(instanceEntity, archiveDir.lastModified());
}
}
@@ -2272,10 +2269,10 @@ public class ViewRegistry {
}
}
if (latestPrevInstance != null) {
- LOG.debug("Previous version of " + instance.getViewEntity().getName() + "/" + instance.getName() + " found: " +
- latestPrevInstance.getViewEntity().getName() + "/" + latestPrevInstance.getName());
+ LOG.debug("Previous version of {}/{} found: {}/{}",
+ instance.getViewEntity().getName(), instance.getName(), latestPrevInstance.getViewEntity().getName(), latestPrevInstance.getName());
} else {
- LOG.debug("Previous version of " + instance.getViewEntity().getName() + "/" + instance.getName() + " not found");
+ LOG.debug("Previous version of {}/{} not found", instance.getViewEntity().getName(), instance.getName());
}
return latestPrevInstance;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
index 9c44597..349b647 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
@@ -37,16 +37,16 @@ import org.apache.ambari.view.URLConnectionProvider;
import org.apache.ambari.view.ViewContext;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Wrapper around an internal URL stream provider.
*/
public class ViewURLStreamProvider implements org.apache.ambari.view.URLStreamProvider, URLConnectionProvider {
- private static final Log LOG = LogFactory.getLog(ViewContextImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewContextImpl.class);
/**
* The key for the "doAs" header.
@@ -270,7 +270,7 @@ public class ViewURLStreamProvider implements org.apache.ambari.view.URLStreamPr
public HostPortRestrictionHandler(String allowedHostPortsValue) {
this.allowedHostPortsValue = allowedHostPortsValue;
- LOG.debug("Proxy restriction will be derived from " + allowedHostPortsValue);
+ LOG.debug("Proxy restriction will be derived from {}", allowedHostPortsValue);
}
/**
@@ -282,7 +282,7 @@ public class ViewURLStreamProvider implements org.apache.ambari.view.URLStreamPr
* @return if the host and port combination is allowed
*/
public boolean allowProxy(String host, String port) {
- LOG.debug("Checking host " + host + " port " + port + " against allowed list.");
+ LOG.debug("Checking host {} port {} against allowed list.", host, port);
if (StringUtils.isNotBlank(host)) {
String hostToCompare = host.trim().toLowerCase();
if (allowedHostPorts == null) {
@@ -327,13 +327,13 @@ public class ViewURLStreamProvider implements org.apache.ambari.view.URLStreamPr
allowed.put(hostAndPort[0], new HashSet<String>());
}
allowed.get(hostAndPort[0]).add("*");
- LOG.debug("Allow proxy to host " + hostAndPort[0] + " and all ports.");
+ LOG.debug("Allow proxy to host {} and all ports.", hostAndPort[0]);
} else {
if (!allowed.containsKey(hostAndPort[0])) {
allowed.put(hostAndPort[0], new HashSet<String>());
}
allowed.get(hostAndPort[0]).add(hostAndPort[1]);
- LOG.debug("Allow proxy to host " + hostAndPort[0] + " and port " + hostAndPort[1]);
+ LOG.debug("Allow proxy to host {} and port {}", hostAndPort[0], hostAndPort[1]);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
index c2c548d..38b77da 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
@@ -75,13 +75,13 @@ import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostImpl;
import org.apache.ambari.server.topology.PersistedState;
import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.easymock.EasyMock;
import org.eclipse.jetty.server.SessionManager;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -103,7 +103,7 @@ import junit.framework.Assert;
public class AgentResourceTest extends RandomPortJerseyTest {
static String PACKAGE_NAME = "org.apache.ambari.server.agent.rest";
- private static Log LOG = LogFactory.getLog(AgentResourceTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AgentResourceTest.class);
protected Client client;
HeartBeatHandler handler;
ActionManager actionManager;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/agent/LocalAgentSimulator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/LocalAgentSimulator.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/LocalAgentSimulator.java
index 9de1509..366f7b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/LocalAgentSimulator.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/LocalAgentSimulator.java
@@ -20,15 +20,15 @@ package org.apache.ambari.server.agent;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The purpose of this class is to simulate the agent.
*/
public class LocalAgentSimulator implements Runnable {
- private static Log LOG = LogFactory.getLog(HeartBeatHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HeartBeatHandler.class);
private Thread agentThread = null;
private volatile boolean shouldRun = true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java
index 0faa311..fb9268e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class TestActionQueue {
- private static Logger LOG = LoggerFactory.getLogger(TestActionQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestActionQueue.class);
private static int threadCount = 100;
static class ActionQueueOperation implements Runnable {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index 7d95ed2..baa9bae 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -559,7 +559,7 @@ public class TestHeartbeatHandler {
handler.handleRegistration(reg);
fail ("Expected failure for non compatible agent version");
} catch (AmbariException e) {
- log.debug("Error:" + e.getMessage());
+ log.debug("Error:{}", e.getMessage());
Assert.assertTrue(e.getMessage().contains(
"Cannot register host with non compatible agent version"));
}
@@ -569,7 +569,7 @@ public class TestHeartbeatHandler {
handler.handleRegistration(reg);
fail ("Expected failure for non compatible agent version");
} catch (AmbariException e) {
- log.debug("Error:" + e.getMessage());
+ log.debug("Error:{}", e.getMessage());
Assert.assertTrue(e.getMessage().contains(
"Cannot register host with non compatible agent version"));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 06f8918..349cb54 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -587,7 +587,7 @@ public class AmbariMetaInfoTest {
for (List<RepositoryInfo> vals : repos.values()) {
for (RepositoryInfo repo : vals) {
- LOG.debug("Dumping repo info : " + repo.toString());
+ LOG.debug("Dumping repo info : {}", repo);
if (repo.getOsType().equals("centos5")) {
centos5Cnt.add(repo.getRepoId());
} else if (repo.getOsType().equals("centos6")) {
@@ -1070,7 +1070,7 @@ public class AmbariMetaInfoTest {
}
}
- Assert.assertEquals(failedMetrics.toString() +
+ Assert.assertEquals(failedMetrics +
" metrics defined with pointInTime=true for both jmx and ganglia types.",
0, failedMetrics.size());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
index b68c666..2950872 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
@@ -26,12 +26,12 @@ import org.apache.ambari.server.RandomPortJerseyTest;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jettison.json.JSONException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -49,7 +49,7 @@ import junit.framework.Assert;
public class PersistServiceTest extends RandomPortJerseyTest {
static String PACKAGE_NAME = "org.apache.ambari.server.api.services";
- private static Log LOG = LogFactory.getLog(PersistServiceTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistServiceTest.class);
Injector injector;
protected Client client;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
index b99b172..9034162 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
@@ -31,11 +31,11 @@ import javax.ws.rs.core.MediaType;
import org.apache.ambari.server.api.rest.BootStrapResource;
import org.apache.ambari.server.bootstrap.BSResponse.BSRunStat;
import org.apache.ambari.server.bootstrap.BootStrapStatus.BSStat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -54,7 +54,7 @@ import junit.framework.Assert;
public class BootStrapResourceTest extends JerseyTest {
static String PACKAGE_NAME = "org.apache.ambari.server.api.rest";
- private static Log LOG = LogFactory.getLog(BootStrapResourceTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapResourceTest.class);
Injector injector;
BootStrapImpl bsImpl;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
index 91ca644..b9da013 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
@@ -28,12 +28,12 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.bootstrap.BootStrapStatus.BSStat;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -42,7 +42,7 @@ import junit.framework.TestCase;
* Test BootStrap Implementation.
*/
public class BootStrapTest extends TestCase {
- private static Log LOG = LogFactory.getLog(BootStrapTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapTest.class);
public TemporaryFolder temp = new TemporaryFolder();
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index e10e4cd..3215e72 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -2054,8 +2054,7 @@ public class AmbariManagementControllerTest {
boolean foundH2CLT = false;
for (ShortTaskStatus taskStatus : taskStatuses) {
- LOG.debug("Task dump :"
- + taskStatus.toString());
+ LOG.debug("Task dump :{}", taskStatus);
Assert.assertEquals(RoleCommand.INSTALL.toString(),
taskStatus.getCommand());
Assert.assertEquals(HostRoleStatus.PENDING.toString(),
@@ -2166,7 +2165,7 @@ public class AmbariManagementControllerTest {
StringBuilder sb = new StringBuilder();
clusters.debugDump(sb);
- LOG.info("Cluster Dump: " + sb.toString());
+ LOG.info("Cluster Dump: " + sb);
for (ServiceComponent sc :
clusters.getCluster(cluster1).getService(serviceName)
@@ -3457,7 +3456,7 @@ public class AmbariManagementControllerTest {
List<Stage> stages = actionDB.getAllStages(requestId);
for (Stage stage : stages) {
- LOG.debug("Stage dump: " + stage.toString());
+ LOG.debug("Stage dump: {}", stage);
}
Assert.assertTrue(!stages.isEmpty());
@@ -3694,7 +3693,7 @@ public class AmbariManagementControllerTest {
// FIXME check stage count
for (Stage stage : stages) {
- LOG.debug("Stage dump: " + stage.toString());
+ LOG.debug("Stage dump: {}", stage);
}
// FIXME verify stages content - execution commands, etc
@@ -3864,7 +3863,7 @@ public class AmbariManagementControllerTest {
// FIXME check stage count
for (Stage stage : stages) {
- LOG.debug("Stage dump: " + stage.toString());
+ LOG.debug("Stage dump: {}", stage);
}
// FIXME verify stages content - execution commands, etc
@@ -5255,7 +5254,7 @@ public class AmbariManagementControllerTest {
List<HostRoleCommand> hrcs = stage.getOrderedHostRoleCommands();
for (HostRoleCommand hrc : hrcs) {
- LOG.debug("role: " + hrc.getRole());
+ LOG.debug("role: {}", hrc.getRole());
if (hrc.getRole().toString().equals("HDFS_CLIENT")) {
if (hrc.getHostName().equals(host3)) {
hdfsCmdHost3 = hrc;
@@ -5494,7 +5493,7 @@ public class AmbariManagementControllerTest {
stages = actionDB.getAllStages(trackAction.getRequestId());
for (Stage s : stages) {
- LOG.info("Stage dump : " + s.toString());
+ LOG.info("Stage dump : " + s);
}
Assert.assertEquals(1, stages.size());
@@ -10398,7 +10397,7 @@ public class AmbariManagementControllerTest {
add(configRequest);
}});
for(ConfigurationResponse resp : requestedConfigs) {
- String secretName = "SECRET:hdfs-site:"+resp.getVersion().toString()+":test.password";
+ String secretName = "SECRET:hdfs-site:"+ resp.getVersion() +":test.password";
if(resp.getConfigs().containsKey("test.password")) {
assertEquals(resp.getConfigs().get("test.password"), secretName);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
index 07540bf..6c47ae1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
@@ -59,7 +59,7 @@ public class AbstractJDBCResourceProviderTest {
AbstractJDBCResourceProvider<TestFields> provider = new TestAbstractJDBCResourceProviderImpl(
requestedIds, null);
Assert.assertEquals(
- TestFields.field1.toString() + "," + TestFields.field2.toString(),
+ TestFields.field1 + "," + TestFields.field2,
provider.getDBFieldString(requestedIds));
Assert.assertEquals(TestFields.field1.toString(),
provider.getDBFieldString(Collections.singleton(property1)));
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
index 7cc6702..89ed022 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
@@ -385,7 +385,7 @@ public class CredentialResourceProviderTest {
} else if ("alias3".equals(alias)) {
Assert.assertEquals(CredentialStoreType.TEMPORARY.name().toLowerCase(), type);
} else {
- Assert.fail("Unexpected alias in list: " + alias.toString());
+ Assert.fail("Unexpected alias in list: " + alias);
}
}
@@ -462,7 +462,7 @@ public class CredentialResourceProviderTest {
if ("alias1".equals(alias)) {
Assert.assertEquals(CredentialStoreType.TEMPORARY.name().toLowerCase(), type);
} else {
- Assert.fail("Unexpected alias in list: " + alias.toString());
+ Assert.fail("Unexpected alias in list: " + alias);
}
}
@@ -658,7 +658,7 @@ public class CredentialResourceProviderTest {
if ("alias1".equals(alias)) {
Assert.assertEquals(CredentialStoreType.TEMPORARY.name().toLowerCase(), type);
} else {
- Assert.fail("Unexpected alias in list: " + alias.toString());
+ Assert.fail("Unexpected alias in list: " + alias);
}
}
@@ -674,7 +674,7 @@ public class CredentialResourceProviderTest {
if ("alias1".equals(alias)) {
Assert.assertEquals(CredentialStoreType.PERSISTED.name().toLowerCase(), type);
} else {
- Assert.fail("Unexpected alias in list: " + alias.toString());
+ Assert.fail("Unexpected alias in list: " + alias);
}
}
@@ -821,7 +821,7 @@ public class CredentialResourceProviderTest {
if ("alias1".equals(alias)) {
Assert.assertEquals(CredentialStoreType.TEMPORARY.name().toLowerCase(), type);
} else {
- Assert.fail("Unexpected alias in list: " + alias.toString());
+ Assert.fail("Unexpected alias in list: " + alias);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetricTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetricTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetricTest.java
index 2df730b..7289674 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetricTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetricTest.java
@@ -88,7 +88,7 @@ public class GangliaMetricTest {
listTemporalMetrics.add(new GangliaMetric.TemporalMetric("0.0", new Long(17)));
listTemporalMetrics.add(new GangliaMetric.TemporalMetric("0.0", new Long(18)));
instance.setDatapointsFromList(listTemporalMetrics);
- System.out.println(instance.toString());
+ System.out.println(instance);
assertTrue(instance.getDatapoints().length == 11);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
index 550cc9f..271d536 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
@@ -106,7 +106,7 @@ import com.google.inject.persist.Transactional;
@Singleton
public class OrmTestHelper {
- private static Logger LOG = LoggerFactory.getLogger(OrmTestHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OrmTestHelper.class);
private AtomicInteger uniqueCounter = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
index 92d8d60..d596084 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
@@ -91,7 +91,7 @@ public class RepositoryVersionDAOTest {
// Assert the version must be unique
RepositoryVersionEntity dupVersion = new RepositoryVersionEntity();
- dupVersion.setDisplayName("display name " + uuid.toString());
+ dupVersion.setDisplayName("display name " + uuid);
dupVersion.setOperatingSystems("repositories");
dupVersion.setStack(stackEntity);
dupVersion.setVersion(first.getVersion());
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/security/CertGenerationTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/CertGenerationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/CertGenerationTest.java
index 784fd86..0ae3001 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/CertGenerationTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/CertGenerationTest.java
@@ -35,14 +35,14 @@ import org.apache.ambari.server.utils.ShellCommandUtil;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -56,7 +56,7 @@ public class CertGenerationTest {
private static final int PASS_FILE_NAME_LEN = 20;
private static final float MAX_PASS_LEN = 100;
- private static Log LOG = LogFactory.getLog(CertGenerationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CertGenerationTest.class);
public static TemporaryFolder temp = new TemporaryFolder();
private static Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/security/SslExecutionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/SslExecutionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/SslExecutionTest.java
index f91f5b7..3614be7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/SslExecutionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/SslExecutionTest.java
@@ -26,12 +26,12 @@ import java.util.Properties;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.state.stack.OsFamily;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -40,7 +40,7 @@ import com.google.inject.Injector;
public class SslExecutionTest {
- private static Log LOG = LogFactory.getLog(SslExecutionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SslExecutionTest.class);
public TemporaryFolder temp = new TemporaryFolder();
Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/MasterKeyServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/MasterKeyServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/MasterKeyServiceTest.java
index f289c11..5f76072 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/MasterKeyServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/MasterKeyServiceTest.java
@@ -31,8 +31,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -40,6 +38,8 @@ import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -51,7 +51,7 @@ public class MasterKeyServiceTest extends TestCase {
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
private String fileDir;
- private static final Log LOG = LogFactory.getLog
+ private static final Logger LOG = LoggerFactory.getLogger
(MasterKeyServiceTest.class);
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
index b85a901..3d8b87d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
@@ -56,12 +56,12 @@ import org.apache.ambari.server.state.HostHealthStatus.HealthStatus;
import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.StackId;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -72,7 +72,7 @@ public class HostTest {
private Clusters clusters;
private HostDAO hostDAO;
private OrmTestHelper helper;
- private static Log LOG = LogFactory.getLog(HostTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HostTest.class);
@Before
public void setup() throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
index 4dedc2f..dbf0c8f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
@@ -78,7 +78,7 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
public class ServiceComponentHostTest {
- private static Logger LOG = LoggerFactory.getLogger(ServiceComponentHostTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceComponentHostTest.class);
@Inject
private Injector injector;
@Inject
@@ -177,8 +177,7 @@ public class ServiceComponentHostTest {
try {
s = c.getService(svc);
} catch (ServiceNotFoundException e) {
- LOG.debug("Calling service create"
- + ", serviceName=" + svc);
+ LOG.debug("Calling service create, serviceName={}", svc);
s = serviceFactory.createNew(c, svc, repositoryVersion);
c.addService(s);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java
index 506846b..d70adad 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java
@@ -55,7 +55,7 @@ import com.google.inject.persist.PersistService;
public class DBInconsistencyTests {
- private static Logger LOG = LoggerFactory.getLogger(DBInconsistencyTests.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DBInconsistencyTests.class);
@Inject
private Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
index e311fea..207e958 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
@@ -193,7 +193,7 @@ public class UpgradeTest {
UpgradeCatalog targetUpgradeCatalog = AbstractUpgradeCatalog
.getUpgradeCatalog(targetVersion);
- LOG.debug("Target upgrade catalog. " + targetUpgradeCatalog);
+ LOG.debug("Target upgrade catalog. {}", targetUpgradeCatalog);
// Read source version from DB
String sourceVersion = schemaUpgradeHelper.readSourceVersion();
[4/4] ambari git commit: AMBARI-19149. Code cleanup: concatenation in
debug messages, unnecessary toString calls
Posted by ad...@apache.org.
AMBARI-19149. Code cleanup: concatenation in debug messages, unnecessary toString calls
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/219f2234
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/219f2234
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/219f2234
Branch: refs/heads/trunk
Commit: 219f22345e6f7b7ad38cdaac02e9bbe8c8ad7254
Parents: d510522
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed May 31 10:25:58 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Mon Jun 12 11:30:03 2017 +0200
----------------------------------------------------------------------
ambari-server/pom.xml | 4 --
.../server/KdcServerConnectionVerification.java | 2 +-
.../ambari/server/StateRecoveryManager.java | 2 +-
.../actionmanager/ActionDBAccessorImpl.java | 6 +-
.../server/actionmanager/ActionManager.java | 8 +--
.../server/actionmanager/ActionScheduler.java | 18 +++--
.../ambari/server/actionmanager/Stage.java | 6 +-
.../apache/ambari/server/agent/ActionQueue.java | 2 +-
.../ambari/server/agent/AgentRequests.java | 10 +--
.../ambari/server/agent/ExecutionCommand.java | 6 +-
.../ambari/server/agent/HeartBeatHandler.java | 17 ++---
.../ambari/server/agent/HeartbeatMonitor.java | 14 ++--
.../ambari/server/agent/HeartbeatProcessor.java | 4 +-
.../apache/ambari/server/agent/HostInfo.java | 2 +-
.../apache/ambari/server/agent/Register.java | 2 +-
.../ambari/server/agent/rest/AgentResource.java | 18 ++---
.../ambari/server/api/query/QueryImpl.java | 4 +-
.../server/api/rest/BootStrapResource.java | 6 +-
.../server/api/services/AmbariMetaInfo.java | 12 ++--
.../ambari/server/api/services/BaseRequest.java | 2 +-
.../api/services/PersistKeyValueService.java | 16 ++---
.../services/parsers/JsonRequestBodyParser.java | 2 +-
.../StackAdvisorBlueprintProcessor.java | 2 +-
.../commands/StackAdvisorCommand.java | 10 +--
.../views/ViewDataMigrationService.java | 6 +-
.../server/bootstrap/BSHostStatusCollector.java | 12 ++--
.../ambari/server/bootstrap/BSRunner.java | 14 ++--
.../ambari/server/bootstrap/BootStrapImpl.java | 6 +-
.../server/checks/UpgradeCheckRegistry.java | 4 +-
.../controller/AmbariActionExecutionHelper.java | 9 +--
.../AmbariCustomCommandExecutionHelper.java | 10 ++-
.../server/controller/AmbariHandlerList.java | 2 +-
.../AmbariManagementControllerImpl.java | 75 +++++++-------------
.../ambari/server/controller/AmbariServer.java | 2 +-
.../server/controller/ControllerModule.java | 2 +-
.../internal/AbstractPropertyProvider.java | 4 +-
.../internal/AbstractProviderModule.java | 15 ++--
.../internal/ActionResourceProvider.java | 3 +-
.../controller/internal/AppCookieManager.java | 8 +--
.../controller/internal/BaseProvider.java | 10 +--
.../BlueprintConfigurationProcessor.java | 9 ++-
.../internal/ClientConfigResourceProvider.java | 2 +-
.../internal/ClusterControllerImpl.java | 4 +-
.../internal/ClusterResourceProvider.java | 6 +-
...atibleRepositoryVersionResourceProvider.java | 2 +-
.../internal/ComponentResourceProvider.java | 6 +-
.../internal/ConfigGroupResourceProvider.java | 12 ++--
.../internal/GroupResourceProvider.java | 4 +-
.../internal/HostComponentResourceProvider.java | 2 +-
.../internal/HostResourceProvider.java | 12 ++--
.../controller/internal/HostStatusHelper.java | 2 +-
.../internal/JobResourceProvider.java | 12 ++--
.../internal/MemberResourceProvider.java | 4 +-
.../PreUpgradeCheckResourceProvider.java | 2 +-
.../internal/RequestResourceProvider.java | 6 +-
.../internal/RequestStageContainer.java | 2 +-
.../internal/ServiceResourceProvider.java | 53 ++++----------
.../internal/TaskAttemptResourceProvider.java | 6 +-
.../controller/internal/URLStreamProvider.java | 10 +--
.../internal/UserResourceProvider.java | 4 +-
.../internal/WidgetLayoutResourceProvider.java | 4 +-
.../internal/WorkflowResourceProvider.java | 6 +-
.../server/controller/jmx/JMXMetricHolder.java | 2 +-
.../logging/LogSearchDataRetrievalService.java | 4 +-
.../logging/LoggingRequestHelperImpl.java | 15 ++--
.../logging/LoggingSearchPropertyProvider.java | 4 +-
.../metrics/MetricsCollectorHAManager.java | 2 +-
.../metrics/MetricsDownsamplingMethod.java | 5 +-
.../metrics/timeline/AMSPropertyProvider.java | 2 +-
.../metrics/timeline/MetricsRequestHelper.java | 20 +++---
.../timeline/cache/TimelineMetricCache.java | 28 +++-----
.../cache/TimelineMetricCacheEntryFactory.java | 46 +++++-------
.../cache/TimelineMetricsCacheSizeOfEngine.java | 6 +-
.../controller/utilities/KerberosChecker.java | 2 +-
.../ServiceCalculatedStateFactory.java | 2 +-
.../server/credentialapi/CredentialUtil.java | 2 +-
.../customactions/ActionDefinitionManager.java | 6 +-
.../alerts/AlertHashInvalidationListener.java | 2 +-
.../alerts/AlertLifecycleListener.java | 2 +-
.../alerts/AlertMaintenanceModeListener.java | 2 +-
.../AlertServiceComponentHostListener.java | 2 +-
.../alerts/AlertServiceStateListener.java | 2 +-
.../alerts/AlertStateChangedListener.java | 2 +-
.../CachedRoleCommandOrderProvider.java | 2 +-
.../server/metadata/RoleCommandOrder.java | 7 +-
.../system/impl/AmbariPerformanceMonitor.java | 4 +-
.../system/impl/DatabaseMetricsSource.java | 2 +-
.../metrics/system/impl/JvmMetricsSource.java | 2 +-
.../system/impl/MetricsConfiguration.java | 2 +-
.../metrics/system/impl/MetricsServiceImpl.java | 2 +-
.../ambari/server/orm/DBAccessorImpl.java | 2 +-
.../server/orm/dao/AlertDefinitionDAO.java | 2 +-
.../orm/entities/RepositoryVersionEntity.java | 2 +-
.../orm/helpers/dbms/GenericDbmsHelper.java | 4 +-
.../server/resources/ResourceManager.java | 11 ++-
.../server/resources/api/rest/GetResource.java | 9 ++-
.../scheduler/AbstractLinearExecutionJob.java | 6 +-
.../scheduler/ExecutionScheduleManager.java | 12 ++--
.../scheduler/ExecutionSchedulerImpl.java | 4 +-
.../server/security/CertificateManager.java | 6 +-
.../ambari/server/security/SecurityFilter.java | 12 ++--
.../AmbariLdapBindAuthenticator.java | 2 +-
.../AmbariPamAuthenticationProvider.java | 2 +-
.../jwt/JwtAuthenticationFilter.java | 2 +-
.../encryption/MasterKeyServiceImpl.java | 8 +--
.../unsecured/rest/CertificateDownload.java | 6 +-
.../unsecured/rest/CertificateSign.java | 6 +-
.../security/unsecured/rest/ConnectionInfo.java | 6 +-
.../kerberos/ADKerberosOperationHandler.java | 6 +-
.../kerberos/CreateKeytabFilesServerAction.java | 6 +-
.../kerberos/DestroyPrincipalsServerAction.java | 2 +-
.../kerberos/IPAKerberosOperationHandler.java | 18 ++---
.../kerberos/MITKerberosOperationHandler.java | 2 +-
.../serveraction/upgrades/ConfigureAction.java | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 2 +-
.../upgrades/UpdateDesiredStackAction.java | 2 +-
.../ambari/server/stack/ExtensionDirectory.java | 2 +-
.../ambari/server/stack/ExtensionModule.java | 4 +-
.../ambari/server/stack/MasterHostResolver.java | 2 +-
.../ambari/server/stack/ServiceDirectory.java | 2 +-
.../ambari/server/stack/ServiceModule.java | 4 +-
.../ambari/server/stack/StackDirectory.java | 7 +-
.../ambari/server/stack/StackManager.java | 9 +--
.../apache/ambari/server/stack/StackModule.java | 20 ++----
.../ambari/server/stageplanner/RoleGraph.java | 2 +-
.../apache/ambari/server/state/CheckHelper.java | 2 +-
.../server/state/ServiceComponentImpl.java | 21 ++----
.../apache/ambari/server/state/ServiceImpl.java | 21 ++----
.../apache/ambari/server/state/StackInfo.java | 2 +-
.../ambari/server/state/action/ActionImpl.java | 23 +++---
.../server/state/cluster/ClusterImpl.java | 45 +++++-------
.../server/state/cluster/ClustersImpl.java | 6 +-
.../ambari/server/state/host/HostImpl.java | 31 +++-----
.../server/state/stack/ConfigUpgradePack.java | 2 +-
.../state/stack/StackRoleCommandOrder.java | 2 +-
.../ambari/server/state/stack/UpgradePack.java | 2 +-
.../state/stack/upgrade/ColocatedGrouping.java | 2 +-
.../upgrade/ConfigUpgradeChangeDefinition.java | 2 +-
.../state/stack/upgrade/ConfigureTask.java | 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../state/stack/upgrade/RestartGrouping.java | 2 +-
.../stack/upgrade/ServiceCheckGrouping.java | 2 +-
.../state/stack/upgrade/StartGrouping.java | 2 +-
.../state/stack/upgrade/StopGrouping.java | 2 +-
.../state/stack/upgrade/TaskWrapperBuilder.java | 2 +-
.../svccomphost/ServiceComponentHostImpl.java | 18 ++---
.../server/topology/BlueprintValidatorImpl.java | 2 +-
.../topology/tasks/ConfigureClusterTask.java | 2 +-
.../server/topology/tasks/TopologyHostTask.java | 4 +-
.../validators/ClusterConfigTypeValidator.java | 2 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 2 +-
.../server/upgrade/SchemaUpgradeHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog222.java | 2 +-
.../server/upgrade/UpgradeCatalog250.java | 10 +--
.../apache/ambari/server/utils/AmbariPath.java | 2 +-
.../ambari/server/utils/CommandUtils.java | 2 +-
.../ambari/server/utils/SecretReference.java | 2 +-
.../ambari/server/utils/ShellCommandUtil.java | 6 +-
.../apache/ambari/server/utils/StageUtils.java | 6 +-
.../server/view/HttpImpersonatorImpl.java | 2 +-
.../server/view/ViewAmbariStreamProvider.java | 2 +-
.../ambari/server/view/ViewContextImpl.java | 6 +-
.../view/ViewDataMigrationContextImpl.java | 6 +-
.../server/view/ViewDataMigrationUtility.java | 4 +-
.../server/view/ViewDirectoryWatcher.java | 6 +-
.../ambari/server/view/ViewExtractor.java | 8 +--
.../apache/ambari/server/view/ViewRegistry.java | 27 ++++---
.../server/view/ViewURLStreamProvider.java | 14 ++--
.../ambari/server/agent/AgentResourceTest.java | 6 +-
.../server/agent/LocalAgentSimulator.java | 6 +-
.../ambari/server/agent/TestActionQueue.java | 2 +-
.../server/agent/TestHeartbeatHandler.java | 4 +-
.../server/api/services/AmbariMetaInfoTest.java | 4 +-
.../server/api/services/PersistServiceTest.java | 6 +-
.../server/bootstrap/BootStrapResourceTest.java | 6 +-
.../ambari/server/bootstrap/BootStrapTest.java | 6 +-
.../AmbariManagementControllerTest.java | 17 +++--
.../AbstractJDBCResourceProviderTest.java | 2 +-
.../CredentialResourceProviderTest.java | 10 +--
.../metrics/ganglia/GangliaMetricTest.java | 2 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 2 +-
.../orm/dao/RepositoryVersionDAOTest.java | 2 +-
.../server/security/CertGenerationTest.java | 6 +-
.../server/security/SslExecutionTest.java | 6 +-
.../encryption/MasterKeyServiceTest.java | 6 +-
.../ambari/server/state/host/HostTest.java | 6 +-
.../svccomphost/ServiceComponentHostTest.java | 5 +-
.../server/testing/DBInconsistencyTests.java | 2 +-
.../ambari/server/upgrade/UpgradeTest.java | 2 +-
189 files changed, 555 insertions(+), 765 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 669f90f..d2b65af 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1348,10 +1348,6 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
index 19b13aa..1f0403b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java
@@ -57,7 +57,7 @@ import com.google.inject.Singleton;
@Singleton
public class KdcServerConnectionVerification {
- private static Logger LOG = LoggerFactory.getLogger(KdcServerConnectionVerification.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KdcServerConnectionVerification.class);
private Configuration config;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
index c92536e..03990a2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java
@@ -36,7 +36,7 @@ import com.google.inject.Inject;
*/
public class StateRecoveryManager {
- private static Logger LOG = LoggerFactory.getLogger(StateRecoveryManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StateRecoveryManager.class);
@Inject
private HostVersionDAO hostVersionDAO;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 982316d..94bb892 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
@@ -579,9 +579,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
long stageId, String role, CommandReport report) {
boolean checkRequest = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Update HostRoleState: "
- + "HostName " + hostname + " requestId " + requestId + " stageId "
- + stageId + " role " + role + " report " + report);
+ LOG.debug("Update HostRoleState: HostName {} requestId {} stageId {} role {} report {}", hostname, requestId, stageId, role, report);
}
long now = System.currentTimeMillis();
@@ -958,7 +956,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
.withTaskId(String.valueOf(commandEntity.getTaskId()))
.withHostName(commandEntity.getHostName())
.withUserName(details.getUserName())
- .withOperation(commandEntity.getRoleCommand().toString() + " " + commandEntity.getRole().toString())
+ .withOperation(commandEntity.getRoleCommand() + " " + commandEntity.getRole())
.withDetails(commandEntity.getCommandDetail())
.withStatus(commandEntity.getStatus().toString())
.withRequestId(String.valueOf(requestId))
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
index 3182b50..e809980 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
@@ -43,7 +43,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class ActionManager {
- private static Logger LOG = LoggerFactory.getLogger(ActionManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionManager.class);
private final ActionScheduler scheduler;
private final ActionDBAccessor db;
private final AtomicLong requestCounter;
@@ -84,10 +84,10 @@ public class ActionManager {
public void sendActions(Request request, ExecuteActionRequest executeActionRequest) throws AmbariException {
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Persisting Request into DB: %s", request));
+ LOG.debug("Persisting Request into DB: {}", request);
if (executeActionRequest != null) {
- LOG.debug("In response to request: " + request.toString());
+ LOG.debug("In response to request: {}", request);
}
}
db.persistActions(request);
@@ -147,7 +147,7 @@ public class ActionManager {
for (CommandReport report : reports) {
HostRoleCommand command = commands.get(report.getTaskId());
if (LOG.isDebugEnabled()) {
- LOG.debug("Processing command report : " + report.toString());
+ LOG.debug("Processing command report : {}", report);
}
if (command == null) {
LOG.warn("The task " + report.getTaskId()
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index e779f78..9a45d1f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -101,7 +101,7 @@ import com.google.inject.persist.UnitOfWork;
@Singleton
class ActionScheduler implements Runnable {
- private static Logger LOG = LoggerFactory.getLogger(ActionScheduler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionScheduler.class);
public static final String FAILED_TASK_ABORT_REASONING =
"Server considered task failed and automatically aborted it";
@@ -395,7 +395,7 @@ class ActionScheduler implements Runnable {
// Check if we can process this stage in parallel with another stages
i_stage++;
long requestId = stage.getRequestId();
- LOG.debug("==> STAGE_i = " + i_stage + "(requestId=" + requestId + ",StageId=" + stage.getStageId() + ")");
+ LOG.debug("==> STAGE_i = {}(requestId={},StageId={})", i_stage, requestId, stage.getStageId());
RequestEntity request = db.getRequestEntity(requestId);
@@ -735,7 +735,7 @@ class ActionScheduler implements Runnable {
}
int i_my = 0;
- LOG.trace("===>host=" + host);
+ LOG.trace("===>host={}", host);
for (ExecutionCommandWrapper wrapper : commandWrappers) {
ExecutionCommand c = wrapper.getExecutionCommand();
@@ -743,8 +743,7 @@ class ActionScheduler implements Runnable {
HostRoleStatus status = s.getHostRoleStatus(host, roleStr);
i_my++;
if (LOG.isTraceEnabled()) {
- LOG.trace("Host task " + i_my + ") id = " + c.getTaskId() + " status = " + status.toString() +
- " (role=" + roleStr + "), roleCommand = " + c.getRoleCommand());
+ LOG.trace("Host task {}) id = {} status = {} (role={}), roleCommand = {}", i_my, c.getTaskId(), status, roleStr, c.getRoleCommand());
}
boolean hostDeleted = false;
if (null != cluster) {
@@ -789,7 +788,7 @@ class ActionScheduler implements Runnable {
commandTimeout += Long.parseLong(timeoutStr) * 1000; // Converting to milliseconds
} else {
LOG.error("Execution command has no timeout parameter" +
- c.toString());
+ c);
}
}
@@ -853,7 +852,7 @@ class ActionScheduler implements Runnable {
// reschedule command
commandsToSchedule.add(c);
- LOG.trace("===> commandsToSchedule(reschedule)=" + commandsToSchedule.size());
+ LOG.trace("===> commandsToSchedule(reschedule)={}", commandsToSchedule.size());
}
} else if (status.equals(HostRoleStatus.PENDING)) {
// in case of DEPENDENCY_ORDERED stage command can be scheduled only if all of it's dependencies are
@@ -865,7 +864,7 @@ class ActionScheduler implements Runnable {
//Need to schedule first time
commandsToSchedule.add(c);
- LOG.trace("===>commandsToSchedule(first_time)=" + commandsToSchedule.size());
+ LOG.trace("===>commandsToSchedule(first_time)={}", commandsToSchedule.size());
}
}
@@ -962,8 +961,7 @@ class ActionScheduler implements Runnable {
}
} catch (ServiceComponentNotFoundException scnex) {
- LOG.debug(componentName + " associated with service " + serviceName +
- " is not a service component, assuming it's an action.");
+ LOG.debug("{} associated with service {} is not a service component, assuming it's an action.", componentName, serviceName);
} catch (ServiceComponentHostNotFoundException e) {
String msg = String.format("Service component host %s not found, " +
"unable to transition to failed state.", componentName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
index 5638439..3be66d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
@@ -67,7 +67,7 @@ public class Stage {
*/
public static final String INTERNAL_HOSTNAME = "_internal_ambari";
- private static Logger LOG = LoggerFactory.getLogger(Stage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Stage.class);
private final long requestId;
private String clusterName;
private long clusterId = -1L;
@@ -853,7 +853,7 @@ public class Stage {
summaryTaskTimeoutForHost += commandTimeout;
} else {
LOG.error("Execution command has no timeout parameter" +
- command.toString());
+ command);
}
}
if (summaryTaskTimeoutForHost > stageTimeout) {
@@ -936,7 +936,7 @@ public class Stage {
builder.append("HOST: ").append(hostRoleCommand.getHostName()).append(" :\n");
builder.append(hostRoleCommand.getExecutionCommandWrapper().getJson());
builder.append("\n");
- builder.append(hostRoleCommand.toString());
+ builder.append(hostRoleCommand);
builder.append("\n");
}
builder.append("STAGE DESCRIPTION END\n");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
index 02f2dc8..1e13e25 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
@@ -38,7 +38,7 @@ import com.google.inject.Singleton;
@Singleton
public class ActionQueue {
- private static Logger LOG = LoggerFactory.getLogger(ActionQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionQueue.class);
private static HashSet<String> EMPTY_HOST_LIST = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
index 5ff1564..8457bb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Singleton;
@@ -34,7 +34,7 @@ import com.google.inject.Singleton;
@Singleton
public class AgentRequests {
- private static Log LOG = LogFactory.getLog(HeartbeatMonitor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HeartbeatMonitor.class);
private final Map<String, Map<String, Boolean>> requiresExecCmdDetails = new HashMap<>();
private final Object _lock = new Object();
@@ -60,7 +60,7 @@ public class AgentRequests {
Map<String, Boolean> perHostRequiresExecCmdDetails = getPerHostRequiresExecCmdDetails(host);
if (perHostRequiresExecCmdDetails != null && perHostRequiresExecCmdDetails.containsKey(component)) {
- LOG.debug("Sending exec command details for " + component);
+ LOG.debug("Sending exec command details for {}", component);
return perHostRequiresExecCmdDetails.get(component);
}
@@ -81,6 +81,6 @@ public class AgentRequests {
@Override
public String toString() {
- return new StringBuilder().append("requiresExecCmdDetails: ").append(requiresExecCmdDetails.toString()).toString();
+ return new StringBuilder().append("requiresExecCmdDetails: ").append(requiresExecCmdDetails).toString();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 17b89b7..3a650ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -29,8 +29,8 @@ import org.apache.ambari.annotations.ExperimentalFeature;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.gson.annotations.SerializedName;
@@ -41,7 +41,7 @@ import com.google.gson.annotations.SerializedName;
*/
public class ExecutionCommand extends AgentCommand {
- private static Log LOG = LogFactory.getLog(ExecutionCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExecutionCommand.class);
public ExecutionCommand() {
super(AgentCommandType.EXECUTION_COMMAND);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index fc6e7a7..89ec963 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -155,10 +155,7 @@ public class HeartBeatHandler {
return createRegisterCommand();
}
- LOG.debug("Received heartbeat from host"
- + ", hostname=" + hostname
- + ", currentResponseId=" + currentResponseId
- + ", receivedResponseId=" + heartbeat.getResponseId());
+ LOG.debug("Received heartbeat from host, hostname={}, currentResponseId={}, receivedResponseId={}", hostname, currentResponseId, heartbeat.getResponseId());
if (heartbeat.getResponseId() == currentResponseId - 1) {
HeartBeatResponse heartBeatResponse = hostResponses.get(hostname);
@@ -249,7 +246,7 @@ public class HeartBeatHandler {
response.setRecoveryConfig(rc);
if (response.getRecoveryConfig() != null) {
- LOG.info("Recovery configuration set to {}", response.getRecoveryConfig().toString());
+ LOG.info("Recovery configuration set to {}", response.getRecoveryConfig());
}
}
}
@@ -268,7 +265,7 @@ public class HeartBeatHandler {
protected void processRecoveryReport(RecoveryReport recoveryReport, String hostname) throws AmbariException {
- LOG.debug("Received recovery report: " + recoveryReport.toString());
+ LOG.debug("Received recovery report: {}", recoveryReport);
Host host = clusterFsm.getHost(hostname);
host.setRecoveryReport(recoveryReport);
}
@@ -283,7 +280,7 @@ public class HeartBeatHandler {
for (AgentCommand ac : cmds) {
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending command string = " + StageUtils.jaxbToString(ac));
+ LOG.debug("Sending command string = {}", StageUtils.jaxbToString(ac));
}
} catch (Exception e) {
throw new AmbariException("Could not get jaxb string for command", e);
@@ -446,7 +443,7 @@ public class HeartBeatHandler {
response.setAgentConfig(config.getAgentConfigsMap());
if(response.getAgentConfig() != null) {
- LOG.debug("Agent configuration map set to " + response.getAgentConfig());
+ LOG.debug("Agent configuration map set to {}", response.getAgentConfig());
}
/*
@@ -464,7 +461,7 @@ public class HeartBeatHandler {
response.setRecoveryConfig(rc);
if(response.getRecoveryConfig() != null) {
- LOG.info("Recovery configuration set to " + response.getRecoveryConfig().toString());
+ LOG.info("Recovery configuration set to " + response.getRecoveryConfig());
}
}
@@ -495,7 +492,7 @@ public class HeartBeatHandler {
}
if(actionQueue.hasPendingTask(hostname)) {
- LOG.debug("Host " + hostname + " has pending tasks");
+ LOG.debug("Host {} has pending tasks", hostname);
response.setHasPendingTasks(true);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index 6d65bbd..d83a5d1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -58,8 +58,8 @@ import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.state.host.HostHeartbeatLostEvent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Injector;
@@ -67,7 +67,7 @@ import com.google.inject.Injector;
* Monitors the node state and heartbeats.
*/
public class HeartbeatMonitor implements Runnable {
- private static Log LOG = LogFactory.getLog(HeartbeatMonitor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HeartbeatMonitor.class);
private Clusters clusters;
private ActionQueue actionQueue;
private ActionManager actionManager;
@@ -120,8 +120,7 @@ public class HeartbeatMonitor implements Runnable {
while (shouldRun) {
try {
doWork();
- LOG.trace("Putting monitor to sleep for " + threadWakeupInterval + " " +
- "milliseconds");
+ LOG.trace("Putting monitor to sleep for {} milliseconds", threadWakeupInterval);
Thread.sleep(threadWakeupInterval);
} catch (InterruptedException ex) {
LOG.warn("Scheduler thread is interrupted going to stop", ex);
@@ -193,8 +192,7 @@ public class HeartbeatMonitor implements Runnable {
// Get status of service components
List<StatusCommand> cmds = generateStatusCommands(hostname);
- LOG.trace("Generated " + cmds.size() + " status commands for host: " +
- hostname);
+ LOG.trace("Generated {} status commands for host: {}", cmds.size(), hostname);
if (cmds.isEmpty()) {
// Nothing to do
} else {
@@ -352,7 +350,7 @@ public class HeartbeatMonitor implements Runnable {
if (statusCmd.getPayloadLevel() == StatusCommand.StatusCommandPayload.EXECUTION_COMMAND) {
ExecutionCommand ec = ambariManagementController.getExecutionCommand(cluster, sch, RoleCommand.START);
statusCmd.setExecutionCommand(ec);
- LOG.debug(componentName + " has more payload for execution command");
+ LOG.debug("{} has more payload for execution command", componentName);
}
return statusCmd;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index d6ae260..a08abab 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -374,7 +374,7 @@ public class HeartbeatProcessor extends AbstractService{
}
}
- LOG.debug("Received command report: " + report);
+ LOG.debug("Received command report: {}", report);
// get this locally; don't touch the database
Host host = clusterFsm.getHost(hostname);
@@ -463,7 +463,7 @@ public class HeartbeatProcessor extends AbstractService{
throw new AmbariException("Invalid command report, service: " + service);
}
if (actionMetadata.getActions(service.toLowerCase()).contains(report.getRole())) {
- LOG.debug(report.getRole() + " is an action - skip component lookup");
+ LOG.debug("{} is an action - skip component lookup", report.getRole());
} else {
try {
Service svc = cl.getService(service);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
index ce16f14..6673bc7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
@@ -378,7 +378,7 @@ public class HostInfo {
}
StringBuilder ret = new StringBuilder();
for (DiskInfo diskInfo : mounts) {
- ret.append("(").append(diskInfo.toString()).append(")");
+ ret.append("(").append(diskInfo).append(")");
}
return ret.toString();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
index ec41a7b..83fef03 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
@@ -115,7 +115,7 @@ public class Register {
"prefix=" + prefix + "\n";
if (hardwareProfile != null)
- ret = ret + "hardwareprofile=" + this.hardwareProfile.toString();
+ ret = ret + "hardwareprofile=" + this.hardwareProfile;
return ret;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
index 0690f7b..a332459 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
@@ -38,8 +38,8 @@ import org.apache.ambari.server.agent.Register;
import org.apache.ambari.server.agent.RegistrationResponse;
import org.apache.ambari.server.agent.RegistrationStatus;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -52,7 +52,7 @@ import com.google.inject.Inject;
@Path("/")
public class AgentResource {
private static HeartBeatHandler hh;
- private static Log LOG = LogFactory.getLog(AgentResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AgentResource.class);
@Inject
public static void init(HeartBeatHandler instance) {
@@ -92,7 +92,7 @@ public class AgentResource {
RegistrationResponse response = null;
try {
response = hh.handleRegistration(message);
- LOG.debug("Sending registration response " + response);
+ LOG.debug("Sending registration response {}", response);
} catch (AmbariException ex) {
response = new RegistrationResponse();
response.setResponseId(-1);
@@ -122,14 +122,14 @@ public class AgentResource {
public HeartBeatResponse heartbeat(HeartBeat message)
throws WebApplicationException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received Heartbeat message " + message);
+ LOG.debug("Received Heartbeat message {}", message);
}
HeartBeatResponse heartBeatResponse;
try {
heartBeatResponse = hh.handleHeartBeat(message);
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending heartbeat response with response id " + heartBeatResponse.getResponseId());
- LOG.debug("Response details " + heartBeatResponse);
+ LOG.debug("Sending heartbeat response with response id {}", heartBeatResponse.getResponseId());
+ LOG.debug("Response details {}", heartBeatResponse);
}
} catch (Exception e) {
LOG.warn("Error in HeartBeat", e);
@@ -155,7 +155,7 @@ public class AgentResource {
public ComponentsResponse components(
@PathParam("clusterName") String clusterName) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received Components request for cluster " + clusterName);
+ LOG.debug("Received Components request for cluster {}", clusterName);
}
ComponentsResponse componentsResponse;
@@ -164,7 +164,7 @@ public class AgentResource {
componentsResponse = hh.handleComponents(clusterName);
if (LOG.isDebugEnabled()) {
LOG.debug("Sending components response");
- LOG.debug("Response details " + componentsResponse);
+ LOG.debug("Response details {}", componentsResponse);
}
} catch (Exception e) {
LOG.warn("Error in Components", e);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
index 1387ded..25fd143 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
@@ -523,7 +523,7 @@ public class QueryImpl implements Query, ResourceInstance {
NoSuchParentResourceException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Executing resource query: " + request + " where " + predicate);
+ LOG.debug("Executing resource query: {} where {}", request, predicate);
}
QueryResponse queryResponse = clusterController.getResources(type, request, predicate);
@@ -534,7 +534,7 @@ public class QueryImpl implements Query, ResourceInstance {
// NoSuchResourceException (404 response) for an empty query result
if(!isCollectionResource()) {
throw new NoSuchResourceException(
- "The requested resource doesn't exist: " + type.toString() + " not found where " + predicate + ".");
+ "The requested resource doesn't exist: " + type + " not found where " + predicate + ".");
}
}
return queryResponse;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
index e5e1aa6..1bf22b1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
@@ -40,8 +40,8 @@ import org.apache.ambari.server.bootstrap.BSResponse;
import org.apache.ambari.server.bootstrap.BootStrapImpl;
import org.apache.ambari.server.bootstrap.BootStrapStatus;
import org.apache.ambari.server.bootstrap.SshHostInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -49,7 +49,7 @@ import com.google.inject.Inject;
public class BootStrapResource {
private static BootStrapImpl bsImpl;
- private static Log LOG = LogFactory.getLog(BootStrapResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapResource.class);
@Inject
public static void init(BootStrapImpl instance) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 76694d4..8965683 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -496,10 +496,7 @@ public class AmbariMetaInfo {
public String getComponentToService(String stackName, String version,
String componentName) throws AmbariException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Looking for service for component"
- + ", stackName=" + stackName
- + ", stackVersion=" + version
- + ", componentName=" + componentName);
+ LOG.debug("Looking for service for component, stackName={}, stackVersion={}, componentName={}", stackName, version, componentName);
}
Map<String, ServiceInfo> services = getServices(stackName, version);
String retService = null;
@@ -839,13 +836,12 @@ public class AmbariMetaInfo {
private void getCustomActionDefinitions(File customActionDefinitionRoot) throws JAXBException, AmbariException {
if (customActionDefinitionRoot != null) {
- LOG.debug("Loading custom action definitions from "
- + customActionDefinitionRoot.getAbsolutePath());
+ LOG.debug("Loading custom action definitions from {}", customActionDefinitionRoot.getAbsolutePath());
if (customActionDefinitionRoot.exists() && customActionDefinitionRoot.isDirectory()) {
adManager.readCustomActionDefinitions(customActionDefinitionRoot);
} else {
- LOG.debug("No action definitions found at " + customActionDefinitionRoot.getAbsolutePath());
+ LOG.debug("No action definitions found at {}", customActionDefinitionRoot.getAbsolutePath());
}
}
}
@@ -1002,7 +998,7 @@ public class AmbariMetaInfo {
ServiceInfo svc = getService(stackName, stackVersion, serviceName);
if (null == svc.getMetricsFile() || !svc.getMetricsFile().exists()) {
- LOG.debug("Metrics file for " + stackName + "/" + stackVersion + "/" + serviceName + " not found.");
+ LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, serviceName);
return null;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
index bf4d930..ebfc62e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
@@ -134,7 +134,7 @@ public abstract class BaseRequest implements Request {
@Override
public Result process() {
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling API Request: '" + getURI() + "'");
+ LOG.debug("Handling API Request: '{}'", getURI());
}
Result result;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
index 6a6b413..59b1d4e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
@@ -35,15 +35,15 @@ import javax.xml.bind.JAXBException;
import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.utils.StageUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@Path("/persist/")
public class PersistKeyValueService {
private static PersistKeyValueImpl persistKeyVal;
- private static Log LOG = LogFactory.getLog(PersistKeyValueService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistKeyValueService.class);
@Inject
public static void init(PersistKeyValueImpl instance) {
@@ -56,7 +56,7 @@ public class PersistKeyValueService {
public Response update(String keyValues)
throws WebApplicationException, InvalidStateTransitionException,
JAXBException, IOException {
- LOG.debug("Received message from UI " + keyValues);
+ LOG.debug("Received message from UI {}", keyValues);
Map<String, String> keyValuesMap = StageUtils.fromJson(keyValues, Map.class);
/* Call into the heartbeat handler */
@@ -70,14 +70,14 @@ public class PersistKeyValueService {
@PUT
@Produces("text/plain")
public String store(String values) throws IOException, JAXBException {
- LOG.debug("Received message from UI " + values);
+ LOG.debug("Received message from UI {}", values);
Collection<String> valueCollection = StageUtils.fromJson(values, Collection.class);
Collection<String> keys = new ArrayList<>(valueCollection.size());
for (String s : valueCollection) {
keys.add(persistKeyVal.put(s));
}
String stringRet = StageUtils.jaxbToString(keys);
- LOG.debug("Returning " + stringRet);
+ LOG.debug("Returning {}", stringRet);
return stringRet;
}
@@ -85,7 +85,7 @@ public class PersistKeyValueService {
@Produces("text/plain")
@Path("{keyName}")
public String getKey( @PathParam("keyName") String keyName) {
- LOG.debug("Looking for keyName " + keyName);
+ LOG.debug("Looking for keyName {}", keyName);
return persistKeyVal.getValue(keyName);
}
@@ -94,7 +94,7 @@ public class PersistKeyValueService {
public String getAllKeyValues() throws JAXBException, IOException {
Map<String, String> ret = persistKeyVal.getAllKeyValues();
String stringRet = StageUtils.jaxbToString(ret);
- LOG.debug("Returning " + stringRet);
+ LOG.debug("Returning {}", stringRet);
return stringRet;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
index b835345..504bf04 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java
@@ -98,7 +98,7 @@ public class JsonRequestBodyParser implements RequestBodyParser {
} catch (IOException e) {
if (LOG.isDebugEnabled()) {
LOG.debug("Caught exception parsing msg body.");
- LOG.debug("Message Body: " + body, e);
+ LOG.debug("Message Body: {}", body, e);
}
throw new BodyParseException(e);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
index 7731b22..273c0ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java
@@ -53,7 +53,7 @@ import com.google.inject.Singleton;
@Singleton
public class StackAdvisorBlueprintProcessor {
- private static Logger LOG = LoggerFactory.getLogger(StackAdvisorBlueprintProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StackAdvisorBlueprintProcessor.class);
private static StackAdvisorHelper stackAdvisorHelper;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 ed27697..c2895d9 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
@@ -51,14 +51,14 @@ import org.apache.ambari.server.utils.DateUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
import org.codehaus.jackson.node.TextNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Parent for all commands.
@@ -71,7 +71,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
*/
private Class<T> type;
- protected static Log LOG = LogFactory.getLog(StackAdvisorCommand.class);
+ protected static Logger LOG = LoggerFactory.getLogger(StackAdvisorCommand.class);
private static final String GET_HOSTS_INFO_URI = "/api/v1/hosts"
+ "?fields=Hosts/*&Hosts/host_name.in(%s)";
@@ -374,7 +374,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
String hostsJSON = (String) response.getEntity();
if (LOG.isDebugEnabled()) {
- LOG.debug("Hosts information: " + hostsJSON);
+ LOG.debug("Hosts information: {}", hostsJSON);
}
Collection<String> unregistered = getUnregisteredHosts(hostsJSON, request.getHosts());
@@ -428,7 +428,7 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
String servicesJSON = (String) response.getEntity();
if (LOG.isDebugEnabled()) {
- LOG.debug("Services information: " + servicesJSON);
+ LOG.debug("Services information: {}", servicesJSON);
}
return servicesJSON;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
index 3b9c58d..df67ecc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewDataMigrationService.java
@@ -28,8 +28,8 @@ import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.view.ViewDataMigrationUtility;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.view.migration.ViewDataMigrationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,7 +46,7 @@ public class ViewDataMigrationService extends BaseService {
/**
* Logger.
*/
- private static final Log LOG = LogFactory.getLog(ViewDataMigrationService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewDataMigrationService.class);
/**
* The singleton view registry.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
index fa8a22a..b72ca20 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSHostStatusCollector.java
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.ambari.server.utils.Closeables;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Runnable class that gets the hoststatus output by looking at the files
@@ -39,7 +39,7 @@ class BSHostStatusCollector {
private List<BSHostStatus> hostStatus;
public static final String logFileFilter = ".log";
public static final String doneFileFilter = ".done";
- private static Log LOG = LogFactory.getLog(BSHostStatusCollector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BSHostStatusCollector.class);
private List<String> hosts;
@@ -68,11 +68,7 @@ class BSHostStatusCollector {
done = new File(requestIdDir, host + doneFileFilter);
log = new File(requestIdDir, host + logFileFilter);
if (LOG.isDebugEnabled()) {
- LOG.debug("Polling bootstrap status for host"
- + ", requestDir=" + requestIdDir
- + ", host=" + host
- + ", doneFileExists=" + done.exists()
- + ", logFileExists=" + log.exists());
+ LOG.debug("Polling bootstrap status for host, requestDir={}, host={}, doneFileExists={}, logFileExists={}", requestIdDir, host, done.exists(), log.exists());
}
if (!done.exists()) {
status.setStatus("RUNNING");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
index c2909a6..c7976ee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java
@@ -32,15 +32,15 @@ import java.util.concurrent.TimeUnit;
import org.apache.ambari.server.bootstrap.BootStrapStatus.BSStat;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author ncole
*
*/
class BSRunner extends Thread {
- private static Log LOG = LogFactory.getLog(BSRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BSRunner.class);
private static final String DEFAULT_USER = "root";
private static final String DEFAULT_SSHPORT = "22";
@@ -212,8 +212,7 @@ class BSRunner extends Thread {
if (LOG.isDebugEnabled()) {
// FIXME needs to be removed later
// security hole
- LOG.debug("Using ssh key=\""
- + sshHostInfo.getSshKey() + "\"");
+ LOG.debug("Using ssh key=\"{}\"", sshHostInfo.getSshKey());
}
String password = sshHostInfo.getPassword();
@@ -338,8 +337,7 @@ class BSRunner extends Thread {
pendingHosts = true;
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Whether hosts status yet to be updated, pending="
- + pendingHosts);
+ LOG.debug("Whether hosts status yet to be updated, pending={}", pendingHosts);
}
if (!pendingHosts) {
break;
@@ -441,7 +439,7 @@ class BSRunner extends Thread {
}
}
} catch (FileNotFoundException ex) {
- LOG.error(ex);
+ LOG.error(ex.toString());
} finally {
if (setupAgentDoneWriter != null) {
setupAgentDoneWriter.close();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
index c166326..bfe40ea 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.bootstrap.BSResponse.BSRunStat;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -44,7 +44,7 @@ public class BootStrapImpl {
private String masterHostname;
long timeout;
- private static Log LOG = LogFactory.getLog(BootStrapImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BootStrapImpl.class);
/* Monotonically increasing requestid for the bootstrap api to query on */
int requestId = 0;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
index 4fdecc7..ff3aeda 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/UpgradeCheckRegistry.java
@@ -43,7 +43,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class UpgradeCheckRegistry {
- private static Logger LOG = LoggerFactory.getLogger(UpgradeCheckRegistry.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeCheckRegistry.class);
/**
* The list of upgrade checks to run through.
@@ -97,7 +97,7 @@ public class UpgradeCheckRegistry {
try {
URL url = jar.toURI().toURL();
urls.add(url);
- LOG.debug("Adding service check jar to classpath: {}", url.toString());
+ LOG.debug("Adding service check jar to classpath: {}", url);
}
catch (Exception e) {
LOG.error("Failed to add service check jar to classpath: {}", jar.getAbsolutePath(), e);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
index 2fa965e..1b0e0e0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariActionExecutionHelper.java
@@ -331,12 +331,9 @@ public class AmbariActionExecutionHelper {
);
if (! ignoredHosts.isEmpty()) {
- LOG.debug("Hosts to ignore: {}.", StringUtils.join(ignoredHosts, ", "));
- LOG.debug("Ignoring action for hosts due to maintenance state." +
- "Ignored hosts =" + ignoredHosts + ", component="
- + componentName + ", service=" + serviceName
- + ", cluster=" + cluster.getClusterName() + ", " +
- "actionName=" + actionContext.getActionName());
+ LOG.debug("Hosts to ignore: {}.", ignoredHosts);
+ LOG.debug("Ignoring action for hosts due to maintenance state.Ignored hosts ={}, component={}, service={}, cluster={}, actionName={}",
+ ignoredHosts, componentName, serviceName, cluster.getClusterName(), actionContext.getActionName());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 554ae1d..9083a66 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -851,7 +851,7 @@ public class AmbariCustomCommandExecutionHelper {
cloneSet.retainAll(includedHosts);
if (cloneSet.size() > 0) {
throw new AmbariException("Same host cannot be specified for inclusion " +
- "as well as exclusion. Hosts: " + cloneSet.toString());
+ "as well as exclusion. Hosts: " + cloneSet);
}
Service service = cluster.getService(serviceName);
@@ -1111,10 +1111,8 @@ public class AmbariCustomCommandExecutionHelper {
List<RequestResourceFilter> resourceFilters = actionExecutionContext.getResourceFilters();
for (RequestResourceFilter resourceFilter : resourceFilters) {
- LOG.debug("Received a command execution request"
- + ", clusterName=" + actionExecutionContext.getClusterName()
- + ", serviceName=" + resourceFilter.getServiceName()
- + ", request=" + actionExecutionContext.toString());
+ LOG.debug("Received a command execution request, clusterName={}, serviceName={}, request={}",
+ actionExecutionContext.getClusterName(), resourceFilter.getServiceName(), actionExecutionContext);
String actionName = actionExecutionContext.getActionName();
if (actionName.contains(SERVICE_CHECK_COMMAND_NAME)) {
@@ -1554,7 +1552,7 @@ public class AmbariCustomCommandExecutionHelper {
return service.getServiceComponent(resourceFilter.getComponentName());
} catch (Exception e) {
- LOG.debug(String.format( "Unknown error appears during getting service component: %s", e.getMessage()));
+ LOG.debug("Unknown error appears during getting service component: {}", e.getMessage());
}
return null;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 9645a36..e134f6d 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
@@ -144,7 +144,7 @@ public class AmbariHandlerList extends HandlerCollection implements ViewInstance
try {
ClassLoader viewClassLoader = viewEntity.getClassLoader();
if (viewClassLoader == null) {
- LOG.debug("No class loader associated with view " + viewEntity.getName() + ".");
+ LOG.debug("No class loader associated with view {}.", viewEntity.getName());
} else {
Thread.currentThread().setContextClassLoader(viewClassLoader);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 2a9d6c9..eb64030 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -435,9 +435,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createCluster request"
- + ", clusterName=" + request.getClusterName()
- + ", request=" + request);
+ LOG.debug("Received a createCluster request, clusterName={}, request={}", request.getClusterName(), request);
}
if (request.getStackVersion() == null
@@ -533,12 +531,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createHostComponent request"
- + ", clusterName=" + request.getClusterName()
- + ", serviceName=" + request.getServiceName()
- + ", componentName=" + request.getComponentName()
- + ", hostname=" + request.getHostname()
- + ", request=" + request);
+ LOG.debug("Received a createHostComponent request, clusterName={}, serviceName={}, componentName={}, hostname={}, request={}",
+ request.getClusterName(), request.getServiceName(), request.getComponentName(), request.getHostname(), request);
}
if (!hostComponentNames.containsKey(request.getClusterName())) {
@@ -604,17 +598,12 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
clusters.getClustersForHost(request.getHostname());
boolean validCluster = false;
if (LOG.isDebugEnabled()) {
- LOG.debug("Looking to match host to cluster"
- + ", hostnameViaReg=" + host.getHostName()
- + ", hostname=" + request.getHostname()
- + ", clusterName=" + request.getClusterName()
- + ", hostClusterMapCount=" + mappedClusters.size());
+ LOG.debug("Looking to match host to cluster, hostnameViaReg={}, hostname={}, clusterName={}, hostClusterMapCount={}",
+ host.getHostName(), request.getHostname(), request.getClusterName(), mappedClusters.size());
}
for (Cluster mappedCluster : mappedClusters) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Host belongs to cluster"
- + ", hostname=" + request.getHostname()
- + ", clusterName=" + mappedCluster.getClusterName());
+ LOG.debug("Host belongs to cluster, hostname={}, clusterName={}", request.getHostname(), mappedCluster.getClusterName());
}
if (mappedCluster.getClusterName().equals(
request.getClusterName())) {
@@ -660,7 +649,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
} else {
msg = "Attempted to create host_component's which already exist: ";
}
- throw new DuplicateResourceException(msg + names.toString());
+ throw new DuplicateResourceException(msg + names);
}
// set restartRequired flag for monitoring services
@@ -1000,7 +989,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throws AmbariException {
final Set<MemberResponse> responses = new HashSet<>();
for (MemberRequest request: requests) {
- LOG.debug("Received a getMembers request, " + request.toString());
+ LOG.debug("Received a getMembers request, {}", request);
final Group group = users.getGroup(request.getGroupName());
if (null == group) {
if (requests.size() == 1) {
@@ -1065,10 +1054,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Set<ClusterResponse> response = new HashSet<>();
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a getClusters request"
- + ", clusterName=" + request.getClusterName()
- + ", clusterId=" + request.getClusterId()
- + ", stackInfo=" + request.getStackVersion());
+ LOG.debug("Received a getClusters request, clusterName={}, clusterId={}, stackInfo={}",
+ request.getClusterName(), request.getClusterId(), request.getStackVersion());
}
Cluster singleCluster = null;
@@ -1128,7 +1115,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
StringBuilder builder = new StringBuilder();
if (LOG.isDebugEnabled()) {
clusters.debugDump(builder);
- LOG.debug("Cluster State for cluster " + builder.toString());
+ LOG.debug("Cluster State for cluster {}", builder);
}
return response;
}
@@ -1652,7 +1639,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
ServiceConfigVersionResponse serviceConfigVersionResponse = null;
if (request.getDesiredConfig() != null && request.getServiceConfigVersionRequest() != null) {
- String msg = "Unable to set desired configs and rollback at same time, request = " + request.toString();
+ String msg = "Unable to set desired configs and rollback at same time, request = " + request;
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
@@ -1660,7 +1647,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
// set the new name of the cluster if change is requested
if (!cluster.getClusterName().equals(request.getClusterName())) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received cluster name change request from " + cluster.getClusterName() + " to " + request.getClusterName());
+ LOG.debug("Received cluster name change request from {} to {}", cluster.getClusterName(), request.getClusterName());
}
if(!AuthorizationHelper.isAuthorized(ResourceType.AMBARI, null, EnumSet.of(RoleAuthorization.AMBARI_RENAME_CLUSTER))) {
@@ -2466,11 +2453,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
String repoInfo = customCommandExecutionHelper.getRepoInfo(cluster, component, host);
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending repo information to agent"
- + ", hostname=" + scHost.getHostName()
- + ", clusterName=" + clusterName
- + ", stackInfo=" + stackId.getStackId()
- + ", repoInfo=" + repoInfo);
+ LOG.debug("Sending repo information to agent, hostname={}, clusterName={}, stackInfo={}, repoInfo={}",
+ scHost.getHostName(), clusterName, stackId.getStackId(), repoInfo);
}
Map<String, String> hostParams = new TreeMap<>();
@@ -2979,15 +2963,12 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
+ ", newDesiredState=" + newState);
default:
throw new AmbariException("Unsupported state change operation"
- + ", newState=" + newState.toString());
+ + ", newState=" + newState);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Create a new host action"
- + ", requestId=" + requestStages.getId()
- + ", componentName=" + scHost.getServiceComponentName()
- + ", hostname=" + scHost.getHostName()
- + ", roleCommand=" + roleCommand.name());
+ LOG.debug("Create a new host action, requestId={}, componentName={}, hostname={}, roleCommand={}",
+ requestStages.getId(), scHost.getServiceComponentName(), scHost.getHostName(), roleCommand.name());
}
// any targeted information
@@ -3663,8 +3644,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
for (UserRequest r : requests) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a delete user request"
- + ", username=" + r.getUsername());
+ LOG.debug("Received a delete user request, username={}", r.getUsername());
}
User u = users.getAnyUser(r.getUsername());
if (null != u) {
@@ -3676,7 +3656,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
@Override
public void deleteGroups(Set<GroupRequest> requests) throws AmbariException {
for (GroupRequest request: requests) {
- LOG.debug("Received a delete group request, groupname=" + request.getGroupName());
+ LOG.debug("Received a delete group request, groupname={}", request.getGroupName());
final Group group = users.getGroup(request.getGroupName());
if (group != null) {
users.removeGroup(group);
@@ -3687,7 +3667,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
@Override
public void deleteMembers(java.util.Set<MemberRequest> requests) throws AmbariException {
for (MemberRequest request : requests) {
- LOG.debug("Received a delete member request, " + request);
+ LOG.debug("Received a delete member request, {}", request);
users.removeMemberFromGroup(request.getGroupName(), request.getUserName());
}
}
@@ -3839,8 +3819,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
for (UserRequest r : requests) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a getUsers request"
- + ", userRequest=" + r.toString());
+ LOG.debug("Received a getUsers request, userRequest={}", r);
}
String requestedUsername = r.getUsername();
@@ -3894,7 +3873,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
throws AmbariException {
final Set<GroupResponse> responses = new HashSet<>();
for (GroupRequest request: requests) {
- LOG.debug("Received a getGroups request, groupRequest=" + request.toString());
+ LOG.debug("Received a getGroups request, groupRequest={}", request);
// get them all
if (null == request.getGroupName()) {
for (Group group: users.getAllGroups()) {
@@ -3993,10 +3972,8 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
);
- LOG.debug("Ignoring hosts when selecting available hosts for action" +
- " due to maintenance state." +
- "Ignored hosts =" + ignoredHosts + ", cluster="
- + cluster.getClusterName() + ", service=" + service.getName());
+ LOG.debug("Ignoring hosts when selecting available hosts for action due to maintenance state.Ignored hosts ={}, cluster={}, service={}",
+ ignoredHosts, cluster.getClusterName(), service.getName());
}
/**
@@ -4066,7 +4043,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
LOG.info("Received action execution request"
+ ", clusterName=" + actionRequest.getClusterName()
- + ", request=" + actionRequest.toString());
+ + ", request=" + actionRequest);
}
ActionExecutionContext actionExecContext = getActionExecutionContext(actionRequest);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 2f799b7..aeba739 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -170,7 +170,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer;
@Singleton
public class AmbariServer {
public static final String VIEWS_URL_PATTERN = "/api/v1/views/*";
- private static Logger LOG = LoggerFactory.getLogger(AmbariServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariServer.class);
/**
* The thread name prefix for threads handling agent requests.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 4fa2362..f3c2ec8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -181,7 +181,7 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
* Used for injection purposes.
*/
public class ControllerModule extends AbstractModule {
- private static Logger LOG = LoggerFactory.getLogger(ControllerModule.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ControllerModule.class);
private static final String AMBARI_PACKAGE = "org.apache.ambari.server";
private final Configuration configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 f7f20cc..322596e 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
@@ -174,7 +174,7 @@ public abstract class AbstractPropertyProvider extends BaseProvider implements P
}
}
if(LOG.isDebugEnabled()) {
- LOG.debug("Retrieved Cluster Ids = " + clusterResId.toString());
+ LOG.debug("Retrieved Cluster Ids = {}", clusterResId);
}
return clusterResId;
}
@@ -204,7 +204,7 @@ public abstract class AbstractPropertyProvider extends BaseProvider implements P
}
if(LOG.isDebugEnabled()) {
- LOG.debug("Retrieved cluster's Resource Id = " + clusterResIds + ", Resource Type = " + resType);
+ LOG.debug("Retrieved cluster's Resource Id = {}, Resource Type = {}", clusterResIds, resType);
}
Iterator<Long> clusResIdsItr = clusterResIds.iterator();
while (clusResIdsItr.hasNext()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 8975837..0e4f3f4 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
@@ -409,7 +409,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
if (!vipHostConfigPresent) {
currentCollectorHost = metricsCollectorHAManager.getCollectorHost(clusterName);
}
- LOG.debug("Cluster Metrics Vip Host : " + clusterMetricserverVipHost);
+ LOG.debug("Cluster Metrics Vip Host : {}", clusterMetricserverVipHost);
return (clusterMetricserverVipHost != null) ? clusterMetricserverVipHost : currentCollectorHost;
}
@@ -560,7 +560,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
}
}
- LOG.debug("jmxPortMap -> " + jmxPortMap);
+ LOG.debug("jmxPortMap -> {}", jmxPortMap);
ConcurrentMap<String, String> hostJmxPorts = clusterJmxPorts.get(hostName);
if (hostJmxPorts == null) {
@@ -1018,7 +1018,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
}
}
value = postProcessPropertyValue(propName, value, evaluatedProperties, null);
- LOG.debug("PROPERTY -> key: " + propName + ", " + "value: " + value);
+ LOG.debug("PROPERTY -> key: {}, value: {}", propName, value);
mConfigs.put(entry.getKey(), value);
@@ -1152,15 +1152,12 @@ public abstract class AbstractProviderModule implements ProviderModule,
jmxProtocolString = "http";
}
if (jmxProtocolString == null) {
- LOG.debug("Detected JMX protocol is null for clusterName = " + clusterName +
- ", componentName = " + componentName);
- LOG.debug("Defaulting JMX to HTTP protocol for for clusterName = " + clusterName +
- ", componentName = " + componentName);
+ LOG.debug("Detected JMX protocol is null for clusterName = {}, componentName = {}", clusterName, componentName);
+ LOG.debug("Defaulting JMX to HTTP protocol for for clusterName = {}, componentName = {}", clusterName, componentName);
jmxProtocolString = "http";
}
if (LOG.isDebugEnabled()) {
- LOG.debug("JMXProtocol = " + jmxProtocolString + ", for clusterName=" + clusterName +
- ", componentName = " + componentName);
+ LOG.debug("JMXProtocol = {}, for clusterName={}, componentName = {}", jmxProtocolString, clusterName, componentName);
}
clusterJmxProtocolMap.put(mapKey, jmxProtocolString);
return jmxProtocolString;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 db9842a..4e618e7 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
@@ -100,8 +100,7 @@ public class ActionResourceProvider extends AbstractControllerResourceProvider {
if (predicate != null) {
for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
ActionRequest actionReq = getRequest(propertyMap);
- LOG.debug("Received a get request for Action with"
- + ", actionName = " + actionReq.getActionName());
+ LOG.debug("Received a get request for Action with, actionName = {}", actionReq.getActionName());
requests.add(actionReq);
}
} else {
[3/4] ambari git commit: AMBARI-19149. Code cleanup: concatenation in
debug messages, unnecessary toString calls
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java
index 7904593..4c63d1e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java
@@ -24,8 +24,6 @@ import java.security.Principal;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
import org.apache.http.HeaderElement;
import org.apache.http.HttpEntity;
@@ -40,6 +38,8 @@ import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles SPNego authentication as a client of hadoop service, caches
@@ -57,7 +57,7 @@ public class AppCookieManager {
private static final EmptyJaasCredentials EMPTY_JAAS_CREDENTIALS = new EmptyJaasCredentials();
private Map<String, String> endpointCookieMap = new ConcurrentHashMap<>();
- private static Log LOG = LogFactory.getLog(AppCookieManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AppCookieManager.class);
/**
* Utility method to exercise AppCookieManager directly
@@ -136,7 +136,7 @@ public class AppCookieManager {
hadoopAuthCookie = HADOOP_AUTH_EQ + quote(hadoopAuthCookie);
setAppCookie(endpoint, hadoopAuthCookie);
if (LOG.isInfoEnabled()) {
- LOG.info("Successful SPNego authentication to URL:" + uri.toString());
+ LOG.info("Successful SPNego authentication to URL:" + uri);
}
return hadoopAuthCookie;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 8c68a12..135eefe 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
@@ -309,10 +309,7 @@ public abstract class BaseProvider {
if (contains) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting property for resource"
- + ", resourceType=" + resource.getType()
- + ", propertyId=" + propertyId
- + ", value=" + value);
+ LOG.debug("Setting property for resource, resourceType={}, propertyId={}, value={}", resource.getType(), propertyId, value);
}
// If the value is a Map then set all of its entries as properties
@@ -335,10 +332,7 @@ public abstract class BaseProvider {
}
if (!contains && LOG.isDebugEnabled()) {
- LOG.debug("Skipping property for resource as not in requestedIds"
- + ", resourceType=" + resource.getType()
- + ", propertyId=" + propertyId
- + ", value=" + value);
+ LOG.debug("Skipping property for resource as not in requestedIds, resourceType={}, propertyId={}, value={}", resource.getType(), propertyId, value);
}
}
return contains;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 7ebefdd..e93b2f7 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
@@ -450,8 +450,7 @@ public class BlueprintConfigurationProcessor {
String newValue = trimmingStrategy.trim(oldValue);
if (!newValue.equals(oldValue)){
- LOG.debug(String.format("Changing value for config %s property %s from [%s] to [%s]",
- configType, propertyName, oldValue, newValue));
+ LOG.debug("Changing value for config {} property {} from [{}] to [{}]", configType, propertyName, oldValue, newValue);
clusterConfig.setProperty(configType, propertyName, newValue);
}
}
@@ -2850,8 +2849,8 @@ public class BlueprintConfigurationProcessor {
ensureProperty(configuration, "core-site", String.format(proxyUserGroups, user), "*", configTypesUpdated);
}
} else {
- LOG.debug("setMissingConfigurations: no user configuration found for type = " + configType +
- ". This may be caused by an error in the blueprint configuration.");
+ LOG.debug("setMissingConfigurations: no user configuration found for type = {}. This may be caused by an error in the blueprint configuration.",
+ configType);
}
}
@@ -2908,7 +2907,7 @@ public class BlueprintConfigurationProcessor {
Map<String, String> configProperties = stack.getConfigurationProperties(blueprintService, configType);
for(Map.Entry<String, String> entry: configProperties.entrySet()) {
- LOG.debug("ADD property " + configType + " " + entry.getKey() + " " + entry.getValue());
+ LOG.debug("ADD property {} {} {}", configType, entry.getKey(), entry.getValue());
ensureProperty(configuration, configType, entry.getKey(), entry.getValue(), configTypesUpdated);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 181d323..21cf16c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -249,7 +249,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
if (componentMap.size() == 1) {
throw new SystemException("No configuration files defined for the component " + componentInfo.getName());
} else {
- LOG.debug(String.format("No configuration files defined for the component %s",componentInfo.getName()));
+ LOG.debug("No configuration files defined for the component {}", componentInfo.getName());
continue;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
index 1949d06..c5c4ca1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
@@ -130,9 +130,7 @@ public class ClusterControllerImpl implements ClusterController {
if (provider != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Using resource provider "
- + provider.getClass().getName()
- + " for request type " + type.toString());
+ LOG.debug("Using resource provider {} for request type {}", provider.getClass().getName(), type);
}
// make sure that the providers can satisfy the request
checkProperties(type, request, predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 cc3234b..265b89b 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
@@ -272,8 +272,7 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider
Set<Resource> resources = new HashSet<>();
if (LOG.isDebugEnabled()) {
- LOG.debug("Found clusters matching getClusters request"
- + ", clusterResponseCount=" + responses.size());
+ LOG.debug("Found clusters matching getClusters request, clusterResponseCount={}", responses.size());
}
// Allow internal call to bypass permissions check.
@@ -291,8 +290,7 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider
setResourceProperty(resource, CLUSTER_VERSION_PROPERTY_ID, response.getDesiredStackVersion(), requestedIds);
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding ClusterResponse to resource"
- + ", clusterResponse=" + response.toString());
+ LOG.debug("Adding ClusterResponse to resource, clusterResponse={}", response);
}
resources.add(resource);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 73696c7..f05ffbe 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
@@ -165,7 +165,7 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
if (compatibleRepositoryVersionsMap.containsKey(repositoryVersionEntity.getId())) {
compatibleRepositoryVersionsMap.get(repositoryVersionEntity.getId()).addUpgradePackType(up.getType());
if (LOG.isDebugEnabled()) {
- LOG.debug("Stack id: {} exists in map. Appended new upgrade type {}" + repositoryVersionEntity.getId(), up.getType());
+ LOG.debug("Stack id: {} exists in map. Appended new upgrade type {}{}", up.getType(), repositoryVersionEntity.getId());
}
} else {
CompatibleRepositoryVersion compatibleRepositoryVersionEntity = new CompatibleRepositoryVersion(repositoryVersionEntity);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 292761a..2df3b00 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
@@ -369,7 +369,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
stackId.getStackVersion(), s.getName(), request.getComponentName())) {
throw new IllegalArgumentException("Unsupported or invalid component"
+ " in stack stackInfo=" + stackId.getStackId()
- + " request=" + request.toString());
+ + " request=" + request);
}
}
@@ -412,7 +412,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
stackId.getStackVersion(), s.getName(), request.getComponentName());
if (componentInfo == null) {
throw new AmbariException("Could not get component information from stack definition: Stack=" +
- stackId.toString() + ", Service=" + s.getName() + ", Component=" + request.getComponentName());
+ stackId + ", Service=" + s.getName() + ", Component=" + request.getComponentName());
}
sc.setRecoveryEnabled(componentInfo.isRecoveryEnabled());
LOG.info("Component: {}, recovery_enabled from stack definition:{}", componentInfo.getName(),
@@ -778,7 +778,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
throw new AmbariException("Found non removable host component when trying to delete service component." +
" To remove host component, it must be in DISABLED/INIT/INSTALLED/INSTALL_FAILED/UNKNOWN" +
"/UNINSTALLED/INSTALLING state."
- + ", request=" + request.toString()
+ + ", request=" + request
+ ", current state=" + sc.getDesiredState() + ".");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index cc23177..c2b998c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -314,11 +314,8 @@ public class ConfigGroupResourceProvider extends
Set<ConfigGroupResponse> responses = new HashSet<>();
if (requests != null) {
for (ConfigGroupRequest request : requests) {
- LOG.debug("Received a Config group request with"
- + ", clusterName = " + request.getClusterName()
- + ", groupId = " + request.getId()
- + ", groupName = " + request.getGroupName()
- + ", tag = " + request.getTag());
+ LOG.debug("Received a Config group request with, clusterName = {}, groupId = {}, groupName = {}, tag = {}",
+ request.getClusterName(), request.getId(), request.getGroupName(), request.getTag());
if (request.getClusterName() == null) {
LOG.warn("Cluster name is a required field.");
@@ -485,9 +482,8 @@ public class ConfigGroupResourceProvider extends
|| request.getTag() == null
|| request.getTag().isEmpty()) {
- LOG.debug("Received a config group request with cluster name = " +
- request.getClusterName() + ", group name = " + request.getGroupName()
- + ", tag = " + request.getTag());
+ LOG.debug("Received a config group request with cluster name = {}, group name = {}, tag = {}",
+ request.getClusterName(), request.getGroupName(), request.getTag());
throw new IllegalArgumentException("Cluster name, group name and tag need to be provided.");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 ba60239..f051651 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
@@ -117,9 +117,7 @@ public class GroupResourceProvider extends AbstractControllerResourceProvider {
}
});
- LOG.debug("Found group responses matching get group request"
- + ", groupRequestSize=" + requests.size() + ", groupResponseSize="
- + responses.size());
+ LOG.debug("Found group responses matching get group request, groupRequestSize={}, groupResponseSize={}", requests.size(), responses.size());
Set<String> requestedIds = getRequestPropertyIds(request, predicate);
Set<Resource> resources = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 5166a07..aaf4656 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
@@ -554,7 +554,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
// throw exception if desired state isn't a valid desired state (static check)
if (!newState.isValidDesiredState()) {
throw new IllegalArgumentException("Invalid arguments, invalid"
- + " desired state, desiredState=" + newState.toString());
+ + " desired state, desiredState=" + newState);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 a3216eb..4e2944f 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
@@ -465,7 +465,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
throw new IllegalArgumentException("Invalid request contains"
+ " duplicate hostnames"
- + ", hostnames=" + names.toString());
+ + ", hostnames=" + names);
}
if (!unknowns.isEmpty()) {
@@ -480,7 +480,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
throw new IllegalArgumentException("Attempted to add unknown hosts to a cluster. " +
- "These hosts have not been registered with the server: " + names.toString());
+ "These hosts have not been registered with the server: " + names);
}
Map<String, Set<String>> hostClustersMap = new HashMap<>();
@@ -516,9 +516,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createHost request"
- + ", hostname=" + request.getHostname()
- + ", request=" + request);
+ LOG.debug("Received a createHost request, hostname={}, request={}", request.getHostname(), request);
}
if (allHosts.contains(request.getHostname())) {
@@ -689,9 +687,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
for (HostRequest request : requests) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received an updateHost request"
- + ", hostname=" + request.getHostname()
- + ", request=" + request);
+ LOG.debug("Received an updateHost request, hostname={}, request={}", request.getHostname(), request);
}
Host host = clusters.getHost(request.getHostname());
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 11512c4..f94b979 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
@@ -56,7 +56,7 @@ public class HostStatusHelper {
componentHostResponse = hostComponents.size() == 1 ? hostComponents.iterator().next() : null;
} catch (AmbariException e) {
- LOG.debug("Error checking " + componentName + " server host component state: ", e);
+ LOG.debug("Error checking {} server host component state: ", componentName, e);
return false;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
index 2080e93..e70c367 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
@@ -42,15 +42,15 @@ 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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Resource provider for job resources.
*/
public class JobResourceProvider extends
AbstractJDBCResourceProvider<JobResourceProvider.JobFields> {
- private static Log LOG = LogFactory.getLog(JobResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JobResourceProvider.class);
protected static final String JOB_CLUSTER_NAME_PROPERTY_ID = PropertyHelper
.getPropertyId("Job", "cluster_name");
@@ -224,14 +224,14 @@ public class JobResourceProvider extends
String fields = getDBFieldString(requestedIds);
if (requestedIds.contains(JOB_ELAPSED_TIME_PROPERTY_ID)
&& !requestedIds.contains(JOB_SUBMIT_TIME_PROPERTY_ID))
- fields += "," + getDBField(JOB_SUBMIT_TIME_PROPERTY_ID).toString();
+ fields += "," + getDBField(JOB_SUBMIT_TIME_PROPERTY_ID);
if (jobId == null) {
ps = db.prepareStatement("SELECT " + fields + " FROM " + JOB_TABLE_NAME
- + " WHERE " + JobFields.WORKFLOWID.toString() + " = ?");
+ + " WHERE " + JobFields.WORKFLOWID + " = ?");
ps.setString(1, workflowId);
} else {
ps = db.prepareStatement("SELECT " + fields + " FROM " + JOB_TABLE_NAME
- + " WHERE " + JobFields.JOBID.toString() + " = ?");
+ + " WHERE " + JobFields.JOBID + " = ?");
ps.setString(1, jobId);
}
return ps.executeQuery();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 48a9b47..d9d56ee 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
@@ -119,9 +119,7 @@ public class MemberResourceProvider extends AbstractControllerResourceProvider {
}
});
- LOG.debug("Found member responses matching get members request"
- + ", membersRequestSize=" + requests.size() + ", membersResponseSize="
- + responses.size());
+ LOG.debug("Found member responses matching get members request, membersRequestSize={}, membersResponseSize={}", requests.size(), responses.size());
Set<String> requestedIds = getRequestPropertyIds(request, predicate);
Set<Resource> resources = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
index 8f00456..ea8fb37 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
@@ -64,7 +64,7 @@ import com.google.inject.Provider;
*/
@StaticallyInject
public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
- private static Logger LOG = LoggerFactory.getLogger(PreUpgradeCheckResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PreUpgradeCheckResourceProvider.class);
//----- Property ID constants ---------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 f41eb26..deb0d7c 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
@@ -453,7 +453,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
resourceFilterList.addAll(parseRequestResourceFilter(resourceMap,
(String) propertyMap.get(REQUEST_CLUSTER_NAME_PROPERTY_ID)));
}
- LOG.debug("RequestResourceFilters : " + resourceFilters);
+ LOG.debug("RequestResourceFilters : {}", resourceFilters);
}
// Extract operation level property
RequestOperationLevel operationLevel = null;
@@ -658,9 +658,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
status = org.apache.ambari.server.actionmanager.RequestStatus.valueOf(requestStatus);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a Get Request Status request"
- + ", requestId=null"
- + ", requestStatus=" + status);
+ LOG.debug("Received a Get Request Status request, requestId=null, requestStatus={}", status);
}
maxResults = (maxResults != null) ? maxResults : BaseRequest.DEFAULT_PAGE_SIZE;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java
index 476c3d4..1452c3c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java
@@ -218,7 +218,7 @@ public class RequestStageContainer {
if (request != null && request.getStages()!= null && !request.getStages().isEmpty()) {
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Triggering Action Manager, request=%s", request));
+ LOG.debug("Triggering Action Manager, request={}", request);
}
actionManager.sendActions(request, actionRequest);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 0600159..c97caee 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
@@ -596,7 +596,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
LOG.info("Received a updateService request"
+ ", clusterName=" + request.getClusterName()
+ ", serviceName=" + request.getServiceName()
- + ", request=" + request.toString());
+ + ", request=" + request);
clusterNames.add(request.getClusterName());
@@ -677,10 +677,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (newState == null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Nothing to do for new updateService request"
- + ", clusterName=" + request.getClusterName()
- + ", serviceName=" + request.getServiceName()
- + ", newDesiredState=null");
+ LOG.debug("Nothing to do for new updateService request, clusterName={}, serviceName={}, newDesiredState=null",
+ request.getClusterName(), request.getServiceName());
}
continue;
}
@@ -799,12 +797,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
changedComps.get(newState).add(sc);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling update to ServiceComponent"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + service.getName()
- + ", componentName=" + sc.getName()
- + ", currentDesiredState=" + oldScState
- + ", newDesiredState=" + newState);
+ LOG.debug("Handling update to ServiceComponent, clusterName={}, serviceName={}, componentName={}, currentDesiredState={}, newDesiredState={}",
+ cluster.getClusterName(), service.getName(), sc.getName(), oldScState, newState);
}
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
@@ -812,13 +806,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (oldSchState == State.DISABLED || oldSchState == State.UNKNOWN) {
//Ignore host components updates in this state
if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring ServiceComponentHost"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + service.getName()
- + ", componentName=" + sc.getName()
- + ", hostname=" + sch.getHostName()
- + ", currentState=" + oldSchState
- + ", newDesiredState=" + newState);
+ LOG.debug("Ignoring ServiceComponentHost, clusterName={}, serviceName={}, componentName={}, hostname={}, currentState={}, newDesiredState={}",
+ cluster.getClusterName(), service.getName(), sc.getName(), sch.getHostName(), oldSchState, newState);
}
continue;
}
@@ -826,13 +815,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (newState == oldSchState) {
ignoredScHosts.add(sch);
if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring ServiceComponentHost"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + service.getName()
- + ", componentName=" + sc.getName()
- + ", hostname=" + sch.getHostName()
- + ", currentState=" + oldSchState
- + ", newDesiredState=" + newState);
+ LOG.debug("Ignoring ServiceComponentHost, clusterName={}, serviceName={}, componentName={}, hostname={}, currentState={}, newDesiredState={}",
+ cluster.getClusterName(), service.getName(), sc.getName(), sch.getHostName(), oldSchState, newState);
}
continue;
}
@@ -840,11 +824,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
if (! maintenanceStateHelper.isOperationAllowed(reqOpLvl, sch)) {
ignoredScHosts.add(sch);
if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring ServiceComponentHost"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + service.getName()
- + ", componentName=" + sc.getName()
- + ", hostname=" + sch.getHostName());
+ LOG.debug("Ignoring ServiceComponentHost, clusterName={}, serviceName={}, componentName={}, hostname={}",
+ cluster.getClusterName(), service.getName(), sc.getName(), sch.getHostName());
}
continue;
}
@@ -887,13 +868,8 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
new ArrayList<ServiceComponentHost>());
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling update to ServiceComponentHost"
- + ", clusterName=" + cluster.getClusterName()
- + ", serviceName=" + service.getName()
- + ", componentName=" + sc.getName()
- + ", hostname=" + sch.getHostName()
- + ", currentState=" + oldSchState
- + ", newDesiredState=" + newState);
+ LOG.debug("Handling update to ServiceComponentHost, clusterName={}, serviceName={}, componentName={}, hostname={}, currentState={}, newDesiredState={}",
+ cluster.getClusterName(), service.getName(), sc.getName(), sch.getHostName(), oldSchState, newState);
}
changedScHosts.get(sc.getName()).get(newState).add(sch);
}
@@ -1048,8 +1024,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
Validate.notEmpty(serviceName, "Service name should be provided when creating a service");
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a createService request"
- + ", clusterName=" + clusterName + ", serviceName=" + serviceName + ", request=" + request);
+ LOG.debug("Received a createService request, clusterName={}, serviceName={}, request={}", clusterName, serviceName, request);
}
if(!AuthorizationHelper.isAuthorized(ResourceType.CLUSTER, getClusterResourceId(clusterName), RoleAuthorization.SERVICE_ADD_DELETE_SERVICES)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
index 2165fc7..3af7bb1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
@@ -42,15 +42,15 @@ 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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Resource provider for task attempt resources.
*/
public class TaskAttemptResourceProvider extends
AbstractJDBCResourceProvider<TaskAttemptResourceProvider.TaskAttemptFields> {
- private static Log LOG = LogFactory.getLog(TaskAttemptResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskAttemptResourceProvider.class);
protected static final String TASK_ATTEMPT_CLUSTER_NAME_PROPERTY_ID = PropertyHelper
.getPropertyId("TaskAttempt", "cluster_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
index ff36d9b..d1e9349 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
@@ -38,9 +38,9 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.controller.utilities.StreamProvider;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* URL based implementation of a stream provider.
@@ -50,7 +50,7 @@ public class URLStreamProvider implements StreamProvider {
public static final String COOKIE = "Cookie";
private static final String WWW_AUTHENTICATE = "WWW-Authenticate";
private static final String NEGOTIATE = "Negotiate";
- private static Log LOG = LogFactory.getLog(URLStreamProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(URLStreamProvider.class);
private boolean setupTruststoreForHttps;
private final int connTimeout;
@@ -175,7 +175,7 @@ public class URLStreamProvider implements StreamProvider {
public HttpURLConnection processURL(String spec, String requestMethod, byte[] body, Map<String, List<String>> headers)
throws IOException {
if (LOG.isDebugEnabled()) {
- LOG.debug("readFrom spec:" + spec);
+ LOG.debug("readFrom spec:{}", spec);
}
HttpURLConnection connection = (spec.startsWith("https") && this.setupTruststoreForHttps) ?
@@ -185,7 +185,7 @@ public class URLStreamProvider implements StreamProvider {
String appCookie = appCookieManager.getCachedAppCookie(spec);
if (appCookie != null) {
- LOG.debug("Using cached app cookie for URL:" + spec);
+ LOG.debug("Using cached app cookie for URL:{}", spec);
// allow for additional passed in cookies
if (headers == null || headers.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 2ec63db..c5c36e9 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
@@ -119,9 +119,7 @@ public class UserResourceProvider extends AbstractControllerResourceProvider imp
});
if (LOG.isDebugEnabled()) {
- LOG.debug("Found user responses matching get user request"
- + ", userRequestSize=" + requests.size()
- + ", userResponseSize=" + responses.size());
+ LOG.debug("Found user responses matching get user request, userRequestSize={}, userResponseSize={}", requests.size(), responses.size());
}
Set<String> requestedIds = getRequestPropertyIds(request, predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
index 494f32b..2c5ab2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
@@ -170,7 +170,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
long id = Integer.parseInt(widget.get("id").toString());
WidgetEntity widgetEntity = widgetDAO.findById(id);
if (widgetEntity == null) {
- throw new AmbariException("Widget with id " + widget.get("id").toString() + " does not exists");
+ throw new AmbariException("Widget with id " + widget.get("id") + " does not exists");
}
WidgetLayoutUserWidgetEntity widgetLayoutUserWidgetEntity = new WidgetLayoutUserWidgetEntity();
@@ -308,7 +308,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
long id = Integer.parseInt(widget.get("id").toString());
WidgetEntity widgetEntity = widgetDAO.findById(id);
if (widgetEntity == null) {
- throw new AmbariException("Widget with id " + widget.get("id").toString() + " does not exists");
+ throw new AmbariException("Widget with id " + widget.get("id") + " does not exists");
}
WidgetLayoutUserWidgetEntity widgetLayoutUserWidgetEntity = new WidgetLayoutUserWidgetEntity();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
index e3935bb..13cb8a4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
@@ -42,15 +42,15 @@ 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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Resource provider for workflow resources.
*/
public class WorkflowResourceProvider extends
AbstractJDBCResourceProvider<WorkflowResourceProvider.WorkflowFields> {
- private static Log LOG = LogFactory.getLog(WorkflowResourceProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WorkflowResourceProvider.class);
protected static final String WORKFLOW_CLUSTER_NAME_PROPERTY_ID = PropertyHelper
.getPropertyId("Workflow", "cluster_name");
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java
index 5347919..81d72fb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXMetricHolder.java
@@ -42,7 +42,7 @@ public final class JMXMetricHolder {
for (Map<String, Object> map : beans) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
- stringBuilder.append(" ").append(entry.toString()).append("\n");
+ stringBuilder.append(" ").append(entry).append("\n");
}
}
return stringBuilder.toString();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
index 4370cfc..498b636 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalService.java
@@ -68,7 +68,7 @@ import com.google.inject.Injector;
@AmbariService
public class LogSearchDataRetrievalService extends AbstractService {
- private static Logger LOG = LoggerFactory.getLogger(LogSearchDataRetrievalService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogSearchDataRetrievalService.class);
/**
* Maximum number of failed attempts that the LogSearch integration code will attempt for
@@ -147,7 +147,7 @@ public class LogSearchDataRetrievalService extends AbstractService {
final int maxTimeoutForCacheInHours =
ambariServerConfiguration.getLogSearchMetadataCacheExpireTimeout();
- LOG.debug("Caches configured with a max expire timeout of " + maxTimeoutForCacheInHours + " hours.");
+ LOG.debug("Caches configured with a max expire timeout of {} hours.", maxTimeoutForCacheInHours);
// initialize the log file name cache
logFileNameCache = CacheBuilder.newBuilder().expireAfterWrite(maxTimeoutForCacheInHours, TimeUnit.HOURS).build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
index 7e7656d..ff44b0f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
*/
public class LoggingRequestHelperImpl implements LoggingRequestHelper {
- private static Logger LOG = LoggerFactory.getLogger(LoggingRequestHelperImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LoggingRequestHelperImpl.class);
private static final String LOGSEARCH_ADMIN_JSON_CONFIG_TYPE_NAME = "logsearch-admin-json";
@@ -156,7 +156,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
try {
// use the Apache builder to create the correct URI
URI logSearchURI = createLogSearchQueryURI(protocol, queryParameters);
- LOG.debug("Attempting to connect to LogSearch server at " + logSearchURI);
+ LOG.debug("Attempting to connect to LogSearch server at {}", logSearchURI);
HttpURLConnection httpURLConnection = (HttpURLConnection) logSearchURI.toURL().openConnection();
secure(httpURLConnection, protocol);
httpURLConnection.setRequestMethod("GET");
@@ -313,7 +313,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
LogLineResult lineOne = response.getListOfResults().get(0);
// this assumes that each component has only one associated log file,
// which may not always hold true
- LOG.debug("For componentName = " + componentName + ", log file name is = " + lineOne.getLogFilePath());
+ LOG.debug("For componentName = {}, log file name is = {}", componentName, lineOne.getLogFilePath());
return Collections.singleton(lineOne.getLogFilePath());
}
@@ -326,7 +326,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
try {
// use the Apache builder to create the correct URI
URI logLevelQueryURI = createLogLevelQueryURI(protocol, componentName, hostName);
- LOG.debug("Attempting to connect to LogSearch server at " + logLevelQueryURI);
+ LOG.debug("Attempting to connect to LogSearch server at {}", logLevelQueryURI);
HttpURLConnection httpURLConnection = (HttpURLConnection) logLevelQueryURI.toURL().openConnection();
secure(httpURLConnection, protocol);
@@ -446,7 +446,8 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
if (credential == null) {
LOG.debug("LogSearch credentials could not be obtained from store.");
} else {
- LOG.debug("LogSearch credentials were not of the correct type, this is likely an error in configuration, credential type is = " + credential.getClass().getName());
+ LOG.debug("LogSearch credentials were not of the correct type, this is likely an error in configuration, credential type is = {}",
+ credential.getClass().getName());
}
} catch (AmbariException ambariException) {
LOG.debug("Error encountered while trying to obtain LogSearch admin credentials.", ambariException);
@@ -488,7 +489,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
// read in the response from LogSearch
resultStream = httpURLConnection.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(resultStream));
- LOG.debug("Response code from LogSearch Service is = " + httpURLConnection.getResponseCode());
+ LOG.debug("Response code from LogSearch Service is = {}", httpURLConnection.getResponseCode());
String line = reader.readLine();
@@ -498,7 +499,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
line = reader.readLine();
}
- LOG.debug("Sucessfully retrieved response from server, response = " + buffer);
+ LOG.debug("Sucessfully retrieved response from server, response = {}", buffer);
return buffer;
} finally {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
index 05fbc5a..64261b3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingSearchPropertyProvider.java
@@ -85,9 +85,9 @@ public class LoggingSearchPropertyProvider implements PropertyProvider {
// Test to see if the authenticated user is authorized to view this data... if not, skip it.
if(!AuthorizationHelper.isAuthorized(ResourceType.CLUSTER, getClusterResourceID(clusterName), REQUIRED_AUTHORIZATIONS)) {
if(LOG.isDebugEnabled()) {
- LOG.debug(String.format("The authenticated user (%s) is not authorized to access LogSearch data for the cluster named %s",
+ LOG.debug("The authenticated user ({}) is not authorized to access LogSearch data for the cluster named {}",
AuthorizationHelper.getAuthenticatedName(),
- clusterName));
+ clusterName);
}
continue;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 b1dfed9..f107aab 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
@@ -84,7 +84,7 @@ public class MetricsCollectorHAManager {
@Subscribe
public void onMetricsCollectorHostDownEvent(MetricsCollectorHostDownEvent event) {
- LOG.debug("MetricsCollectorHostDownEvent caught, Down collector : " + event.getCollectorHost());
+ LOG.debug("MetricsCollectorHostDownEvent caught, Down collector : {}", event.getCollectorHost());
String clusterName = event.getClusterName();
MetricsCollectorHAClusterState collectorHAClusterState = clusterCollectorHAState.get(clusterName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 8044c7b..5994f16 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
@@ -40,9 +40,8 @@ public abstract class MetricsDownsamplingMethod {
&& timestamp <= temporalInfo.getEndTimeMillis();
if (!retVal && LOG.isTraceEnabled()) {
- LOG.trace("Ignoring out of band metric with ts: " + timestamp + ", "
- + "temporalInfo: startTime = " + temporalInfo.getStartTimeMillis() + ","
- + " endTime = " + temporalInfo.getEndTimeMillis());
+ LOG.trace("Ignoring out of band metric with ts: {}, temporalInfo: startTime = {}, endTime = {}",
+ timestamp, temporalInfo.getStartTimeMillis(), temporalInfo.getEndTimeMillis());
}
return retVal;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/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 b1ab855..6d859fa 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
@@ -716,7 +716,7 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
private String preprocessPropertyId(String propertyId, String componentName) {
if (propertyId.startsWith("jvm") && JVM_PROCESS_NAMES.keySet().contains(componentName)) {
String newPropertyId = propertyId.replace("jvm.", "jvm." + JVM_PROCESS_NAMES.get(componentName));
- LOG.debug("Pre-process: " + propertyId + ", to: " + newPropertyId);
+ LOG.debug("Pre-process: {}, to: {}", propertyId, newPropertyId);
return newPropertyId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
index efb9d2d..87a4634 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java
@@ -71,7 +71,7 @@ public class MetricsRequestHelper {
}
public TimelineMetrics fetchTimelineMetrics(URIBuilder uriBuilder, Long startTime, Long endTime) throws IOException {
- LOG.debug("Metrics request url = " + uriBuilder.toString());
+ LOG.debug("Metrics request url = {}", uriBuilder);
BufferedReader reader = null;
TimelineMetrics timelineMetrics = null;
try {
@@ -83,7 +83,7 @@ public class MetricsRequestHelper {
//Try one more time with higher precision
String higherPrecision = getHigherPrecision(uriBuilder, startTime, endTime);
if (higherPrecision != null) {
- LOG.debug("Requesting metrics with higher precision : " + higherPrecision);
+ LOG.debug("Requesting metrics with higher precision : {}", higherPrecision);
uriBuilder.setParameter("precision", higherPrecision);
String newSpec = uriBuilder.toString();
connection = streamProvider.processURL(newSpec, HttpMethod.GET, (String) null,
@@ -102,13 +102,9 @@ public class MetricsRequestHelper {
if (LOG.isTraceEnabled()) {
for (TimelineMetric metric : timelineMetrics.getMetrics()) {
- LOG.trace("metric: " + metric.getMetricName() +
- ", size = " + metric.getMetricValues().size() +
- ", host = " + metric.getHostName() +
- ", app = " + metric.getAppId() +
- ", instance = " + metric.getInstanceId() +
- ", time = " + metric.getTimestamp() +
- ", startTime = " + new Date(metric.getStartTime()));
+ LOG.trace("metric: {}, size = {}, host = {}, app = {}, instance = {}, time = {}, startTime = {}",
+ metric.getMetricName(), metric.getMetricValues().size(), metric.getHostName(), metric.getAppId(), metric.getInstanceId(), metric.getTimestamp(),
+ new Date(metric.getStartTime()));
}
}
} catch (IOException io) {
@@ -136,9 +132,9 @@ public class MetricsRequestHelper {
} catch (IOException e) {
if (LOG.isWarnEnabled()) {
if (LOG.isDebugEnabled()) {
- LOG.warn("Unable to close http input stream : spec=" + uriBuilder.toString(), e);
+ LOG.warn("Unable to close http input stream : spec=" + uriBuilder, e);
} else {
- LOG.warn("Unable to close http input stream : spec=" + uriBuilder.toString());
+ LOG.warn("Unable to close http input stream : spec=" + uriBuilder);
}
}
}
@@ -155,7 +151,7 @@ public class MetricsRequestHelper {
BufferedReader reader = new BufferedReader(new InputStreamReader(errorStream));
String errorMessage = reader.readLine();
if (errorMessage != null && errorMessage.contains("PrecisionLimitExceededException")) {
- LOG.debug("Encountered Precision exception while requesting metrics : " + errorMessage);
+ LOG.debug("Encountered Precision exception while requesting metrics : {}", errorMessage);
return false;
} else {
throw new IOException(errorMessage);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
index 472e3ea..bfe8456 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java
@@ -57,7 +57,7 @@ public class TimelineMetricCache extends UpdatingSelfPopulatingCache {
*/
public TimelineMetrics getAppTimelineMetricsFromCache(TimelineAppMetricCacheKey key) throws IllegalArgumentException, IOException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Fetching metrics with key: " + key);
+ LOG.debug("Fetching metrics with key: {}", key);
}
// Make sure key is valid
@@ -84,7 +84,7 @@ public class TimelineMetricCache extends UpdatingSelfPopulatingCache {
if (element != null && element.getObjectValue() != null) {
TimelineMetricsCacheValue value = (TimelineMetricsCacheValue) element.getObjectValue();
if (LOG.isDebugEnabled()) {
- LOG.debug("Returning value from cache: " + value);
+ LOG.debug("Returning value from cache: {}", value);
}
timelineMetrics = value.getTimelineMetrics();
}
@@ -93,14 +93,9 @@ public class TimelineMetricCache extends UpdatingSelfPopulatingCache {
// Print stats every 100 calls - Note: Supported in debug mode only
if (printCacheStatsCounter.getAndIncrement() == 0) {
StatisticsGateway statistics = this.getStatistics();
- LOG.debug("Metrics cache stats => \n" +
- ", Evictions = " + statistics.cacheEvictedCount() +
- ", Expired = " + statistics.cacheExpiredCount() +
- ", Hits = " + statistics.cacheHitCount() +
- ", Misses = " + statistics.cacheMissCount() +
- ", Hit ratio = " + statistics.cacheHitRatio() +
- ", Puts = " + statistics.cachePutCount() +
- ", Size in MB = " + (statistics.getLocalHeapSizeInBytes() / 1048576));
+ LOG.debug("Metrics cache stats => \n, Evictions = {}, Expired = {}, Hits = {}, Misses = {}, Hit ratio = {}, Puts = {}, Size in MB = {}",
+ statistics.cacheEvictedCount(), statistics.cacheExpiredCount(), statistics.cacheHitCount(), statistics.cacheMissCount(), statistics.cacheHitRatio(),
+ statistics.cachePutCount(), statistics.getLocalHeapSizeInBytes() / 1048576);
} else {
printCacheStatsCounter.compareAndSet(100, 0);
}
@@ -119,26 +114,23 @@ public class TimelineMetricCache extends UpdatingSelfPopulatingCache {
Element element = this.getQuiet(key);
if (element != null) {
if (LOG.isTraceEnabled()) {
- LOG.trace("key : " + element.getObjectKey());
- LOG.trace("value : " + element.getObjectValue());
+ LOG.trace("key : {}", element.getObjectKey());
+ LOG.trace("value : {}", element.getObjectValue());
}
// Set new time boundaries on the key
TimelineAppMetricCacheKey existingKey = (TimelineAppMetricCacheKey) element.getObjectKey();
- LOG.debug("Existing temporal info: " + existingKey.getTemporalInfo() +
- " for : " + existingKey.getMetricNames());
+ LOG.debug("Existing temporal info: {} for : {}", existingKey.getTemporalInfo(), existingKey.getMetricNames());
TimelineAppMetricCacheKey newKey = (TimelineAppMetricCacheKey) key;
existingKey.setTemporalInfo(newKey.getTemporalInfo());
- LOG.debug("New temporal info: " + newKey.getTemporalInfo() +
- " for : " + existingKey.getMetricNames());
+ LOG.debug("New temporal info: {} for : {}", newKey.getTemporalInfo(), existingKey.getMetricNames());
if (existingKey.getSpec() == null || !existingKey.getSpec().equals(newKey.getSpec())) {
existingKey.setSpec(newKey.getSpec());
- LOG.debug("New spec: " + newKey.getSpec() +
- " for : " + existingKey.getMetricNames());
+ LOG.debug("New spec: {} for : {}", newKey.getSpec(), existingKey.getMetricNames());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
index b9f3e0f..343587b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java
@@ -75,7 +75,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
*/
@Override
public Object createEntry(Object key) throws Exception {
- LOG.debug("Creating cache entry since none exists, key = " + key);
+ LOG.debug("Creating cache entry since none exists, key = {}", key);
TimelineAppMetricCacheKey metricCacheKey = (TimelineAppMetricCacheKey) key;
TimelineMetrics timelineMetrics = null;
@@ -85,7 +85,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
metricCacheKey.getTemporalInfo().getStartTimeMillis(),
metricCacheKey.getTemporalInfo().getEndTimeMillis());
} catch (IOException io) {
- LOG.debug("Caught IOException on fetching metrics. " + io.getMessage());
+ LOG.debug("Caught IOException on fetching metrics. {}", io.getMessage());
throw io;
}
@@ -100,7 +100,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
metricCacheKey.getTemporalInfo().getEndTimeMillis()) //Initial Precision
);
- LOG.debug("Created cache entry: " + value);
+ LOG.debug("Created cache entry: {}", value);
}
return value;
@@ -120,7 +120,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
TimelineAppMetricCacheKey metricCacheKey = (TimelineAppMetricCacheKey) key;
TimelineMetricsCacheValue existingMetrics = (TimelineMetricsCacheValue) value;
- LOG.debug("Updating cache entry, key: " + key + ", with value = " + value);
+ LOG.debug("Updating cache entry, key: {}, with value = {}", key, value);
Long existingSeriesStartTime = existingMetrics.getStartTime();
Long existingSeriesEndTime = existingMetrics.getEndTime();
@@ -139,12 +139,12 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
Long newEndTime = null;
if(!requestedPrecision.equals(currentPrecision)) {
// Ignore cache entry. Get the entire data from the AMS and update the cache.
- LOG.debug("Precision changed from " + currentPrecision + " to " + requestedPrecision);
+ LOG.debug("Precision changed from {} to {}", currentPrecision, requestedPrecision);
newStartTime = requestedStartTime;
newEndTime = requestedEndTime;
} else {
//Get only the metric values for the delta period from the cache.
- LOG.debug("No change in precision " + currentPrecision);
+ LOG.debug("No change in precision {}", currentPrecision);
newStartTime = getRefreshRequestStartTime(existingSeriesStartTime,
existingSeriesEndTime, requestedStartTime);
newEndTime = getRefreshRequestEndTime(existingSeriesStartTime,
@@ -157,13 +157,11 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
!((newStartTime.equals(existingSeriesStartTime) &&
newEndTime.equals(existingSeriesEndTime)) && requestedPrecision.equals(currentPrecision)) ) {
- LOG.debug("Existing cached timeseries startTime = " +
- new Date(getMillisecondsTime(existingSeriesStartTime)) + ", endTime = " +
- new Date(getMillisecondsTime(existingSeriesEndTime)));
+ LOG.debug("Existing cached timeseries startTime = {}, endTime = {}",
+ new Date(getMillisecondsTime(existingSeriesStartTime)), new Date(getMillisecondsTime(existingSeriesEndTime)));
- LOG.debug("Requested timeseries startTime = " +
- new Date(getMillisecondsTime(newStartTime)) + ", endTime = " +
- new Date(getMillisecondsTime(newEndTime)));
+ LOG.debug("Requested timeseries startTime = {}, endTime = {}",
+ new Date(getMillisecondsTime(newStartTime)), new Date(getMillisecondsTime(newEndTime)));
// Update spec with new start and end time
uriBuilder.setParameter("startTime", String.valueOf(newStartTime));
@@ -190,9 +188,8 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
throw io;
}
} else {
- LOG.debug("Skip updating cache with new startTime = " +
- new Date(getMillisecondsTime(newStartTime)) +
- ", new endTime = " + new Date(getMillisecondsTime(newEndTime)));
+ LOG.debug("Skip updating cache with new startTime = {}, new endTime = {}",
+ new Date(getMillisecondsTime(newStartTime)), new Date(getMillisecondsTime(newEndTime)));
}
}
@@ -214,9 +211,8 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
if (LOG.isTraceEnabled()) {
TreeMap<Long, Double> sortedMetrics = new TreeMap<>(timelineMetric.getMetricValues());
- LOG.trace("New metric: " + timelineMetric.getMetricName() +
- " # " + timelineMetric.getMetricValues().size() + ", startTime = " +
- sortedMetrics.firstKey() + ", endTime = " + sortedMetrics.lastKey());
+ LOG.trace("New metric: {} # {}, startTime = {}, endTime = {}",
+ timelineMetric.getMetricName(), timelineMetric.getMetricValues().size(), sortedMetrics.firstKey(), sortedMetrics.lastKey());
}
TimelineMetric existingMetric = null;
@@ -233,9 +229,8 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
if (LOG.isTraceEnabled()) {
TreeMap<Long, Double> sortedMetrics = new TreeMap<>(existingMetric.getMetricValues());
- LOG.trace("Merged metric: " + timelineMetric.getMetricName() + ", " +
- "Final size: " + existingMetric.getMetricValues().size() + ", startTime = " +
- sortedMetrics.firstKey() + ", endTime = " + sortedMetrics.lastKey());
+ LOG.trace("Merged metric: {}, Final size: {}, startTime = {}, endTime = {}",
+ timelineMetric.getMetricName(), existingMetric.getMetricValues().size(), sortedMetrics.firstKey(), sortedMetrics.lastKey());
}
} else {
existingTimelineMetrics.getMetrics().add(timelineMetric);
@@ -253,8 +248,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
existingMetric.setMetricValues(new TreeMap<Long, Double>());
} else {
TreeMap<Long, Double> existingMetricValues = existingMetric.getMetricValues();
- LOG.trace("Existing metric: " + existingMetric.getMetricName() +
- " # " + existingMetricValues.size());
+ LOG.trace("Existing metric: {} # {}", existingMetric.getMetricName(), existingMetricValues.size());
// Retain only the values that are within the [requestStartTime, requestedEndTime] window
existingMetricValues.headMap(requestedStartTime,false).clear();
@@ -281,8 +275,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
startTime = getTimeShiftedStartTime(existingSeriesEndTime);
}
- LOG.trace("Requesting timeseries data with new startTime = " +
- new Date(getMillisecondsTime(startTime)));
+ LOG.trace("Requesting timeseries data with new startTime = {}", new Date(getMillisecondsTime(startTime)));
return startTime;
}
@@ -303,8 +296,7 @@ public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactor
endTime = existingSeriesStartTime;
}
- LOG.trace("Requesting timeseries data with new endTime = " +
- new Date(getMillisecondsTime(endTime)));
+ LOG.trace("Requesting timeseries data with new endTime = {}", new Date(getMillisecondsTime(endTime)));
return endTime;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
index 1470da9..2401d75 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
@@ -124,7 +124,7 @@ public class TimelineMetricsCacheSizeOfEngine implements SizeOfEngine {
timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getType());
timelineMetricPrimitivesApproximation += 8; // Object overhead
- LOG.debug("timelineMetricPrimitivesApproximation bytes = " + timelineMetricPrimitivesApproximation);
+ LOG.debug("timelineMetricPrimitivesApproximation bytes = {}", timelineMetricPrimitivesApproximation);
}
size += timelineMetricPrimitivesApproximation;
@@ -132,11 +132,11 @@ public class TimelineMetricsCacheSizeOfEngine implements SizeOfEngine {
if (metricValues != null && !metricValues.isEmpty()) {
// Numeric wrapper: 12 bytes + 8 bytes Data type + 4 bytes alignment = 48 (Long, Double)
// Tree Map: 12 bytes for header + 20 bytes for 5 object fields : pointers + 1 byte for flag = 40
- LOG.debug("Size of metric value: " + (sizeOfMapEntry + sizeOfMapEntryOverhead) * metricValues.size());
+ LOG.debug("Size of metric value: {}", (sizeOfMapEntry + sizeOfMapEntryOverhead) * metricValues.size());
size += (sizeOfMapEntry + sizeOfMapEntryOverhead) * metricValues.size(); // Treemap size is O(1)
}
}
- LOG.debug("Total Size of metric values in cache: " + size);
+ LOG.debug("Total Size of metric values in cache: {}", size);
}
return size;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java
index 5097c09..b262c12 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java
@@ -41,7 +41,7 @@ public class KerberosChecker {
public static final String JAVA_SECURITY_AUTH_LOGIN_CONFIG =
"java.security.auth.login.config";
- private static Logger LOG = LoggerFactory.getLogger(KerberosChecker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KerberosChecker.class);
@Inject
static Configuration config;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java
index d95a753..935361c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java
@@ -51,7 +51,7 @@ public class ServiceCalculatedStateFactory {
try {
serviceType = Service.Type.valueOf(service);
} catch (Exception e){
- LOG.debug(String.format("Could not parse service name \"%s\", will use default state provider", service));
+ LOG.debug("Could not parse service name \"{}\", will use default state provider", service);
}
if (serviceType == null) { // service is unknown, return default service state provider
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/credentialapi/CredentialUtil.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/credentialapi/CredentialUtil.java b/ambari-server/src/main/java/org/apache/ambari/server/credentialapi/CredentialUtil.java
index e6d7a37..52325d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/credentialapi/CredentialUtil.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/credentialapi/CredentialUtil.java
@@ -424,7 +424,7 @@ public class CredentialUtil extends Configured implements Tool {
// prompt the user to confirm or reject the overwrite
overwrite = ToolRunner
.confirmPrompt("You are about to OVERWRITE the credential " +
- alias + " from CredentialProvider " + provider.toString() +
+ alias + " from CredentialProvider " + provider +
". Continue? ");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
index 9260993..1f2d26f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java
@@ -105,9 +105,9 @@ public class ActionDefinitionManager {
continue;
}
for (ActionDefinitionSpec ad : adx.actionDefinitions()) {
- LOG.debug("Read action definition = " + ad.toString());
+ LOG.debug("Read action definition = {}", ad);
StringBuilder errorReason =
- new StringBuilder("Error while parsing action definition. ").append(ad.toString()).append(" --- ");
+ new StringBuilder("Error while parsing action definition. ").append(ad).append(" --- ");
TargetHostType targetType = safeValueOf(TargetHostType.class, ad.getTargetType(), errorReason);
ActionType actionType = safeValueOf(ActionType.class, ad.getActionType(), errorReason);
@@ -121,7 +121,7 @@ public class ActionDefinitionManager {
String actionName = ad.getActionName();
if (actionDefinitionMap.containsKey(actionName)) {
LOG.warn("Ignoring action definition as a different definition by that name already exists. "
- + ad.toString());
+ + ad);
continue;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHashInvalidationListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHashInvalidationListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHashInvalidationListener.java
index 2d37430..f418abb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHashInvalidationListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHashInvalidationListener.java
@@ -56,7 +56,7 @@ public class AlertHashInvalidationListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertHashInvalidationListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertHashInvalidationListener.class);
/**
* Invalidates hosts so that they can receive updated alert definition
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertLifecycleListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertLifecycleListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertLifecycleListener.java
index 31c2f4a..9dce45a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertLifecycleListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertLifecycleListener.java
@@ -53,7 +53,7 @@ public class AlertLifecycleListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertLifecycleListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertLifecycleListener.class);
/**
* Used for quick lookups of aggregate alerts.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
index 64372e0..f73d7c9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
@@ -54,7 +54,7 @@ public class AlertMaintenanceModeListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertMaintenanceModeListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertMaintenanceModeListener.class);
/**
* Publishes {@link AlertEvent} instances.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceComponentHostListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceComponentHostListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceComponentHostListener.java
index ec61e8c..3563e99 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceComponentHostListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceComponentHostListener.java
@@ -38,7 +38,7 @@ public class AlertServiceComponentHostListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertServiceComponentHostListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertServiceComponentHostListener.class);
/**
* Used for deleting the alert notices when a definition is disabled.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
index 7a936fe..053fb54 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertServiceStateListener.java
@@ -60,7 +60,7 @@ public class AlertServiceStateListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertServiceStateListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertServiceStateListener.class);
/**
* Services metainfo; injected lazily as a {@link Provider} since JPA is not
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertStateChangedListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertStateChangedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertStateChangedListener.java
index bc24b6d..d5dc530 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertStateChangedListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertStateChangedListener.java
@@ -77,7 +77,7 @@ public class AlertStateChangedListener {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertStateChangedListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertStateChangedListener.class);
/**
* A logger that is only for logging alert state changes so that there is an
[2/4] ambari git commit: AMBARI-19149. Code cleanup: concatenation in
debug messages, unnecessary toString calls
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
index a874f99..c6315a7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
@@ -38,7 +38,7 @@ import com.google.inject.Injector;
*/
public class CachedRoleCommandOrderProvider implements RoleCommandOrderProvider {
- private static Logger LOG = LoggerFactory.getLogger(CachedRoleCommandOrderProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CachedRoleCommandOrderProvider.class);
@Inject
private Injector injector;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
index fc6c124..ef2c9a9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
@@ -274,8 +274,7 @@ public class RoleCommandOrder implements Cloneable {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding dependency for " + restartPair + ", " +
- "dependencies => " + roleCommandDeps);
+ LOG.debug("Adding dependency for {}, dependencies => {}", restartPair, roleCommandDeps);
}
missingDependencies.put(restartPair, roleCommandDeps);
}
@@ -338,9 +337,7 @@ public class RoleCommandOrder implements Cloneable {
v1 = dependencies.get(roleCommandPairSetEntry.getKey());
v2 = rco.dependencies.get(roleCommandPairSetEntry.getKey());
if (!v1.equals(v2)) {
- LOG.debug("different entry found for key ("
- + roleCommandPairSetEntry.getKey().getRole().toString() + ", "
- + roleCommandPairSetEntry.getKey().getCmd().toString() + ")" );
+ LOG.debug("different entry found for key ({}, {})", roleCommandPairSetEntry.getKey().getRole(), roleCommandPairSetEntry.getKey().getCmd());
return 1;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java
index 3453a22..58bcc6f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariPerformanceMonitor.java
@@ -38,7 +38,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class AmbariPerformanceMonitor extends PerformanceMonitor {
- private static Logger LOG = LoggerFactory.getLogger(AmbariPerformanceMonitor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariPerformanceMonitor.class);
private boolean isInitialized = false;
private DatabaseMetricsSource metricsSource;
private static String entityPackagePrefix = "org.apache"; //Can be made into a set later if needed.
@@ -111,7 +111,7 @@ public class AmbariPerformanceMonitor extends PerformanceMonitor {
init();
}
if (isInitialized) {
- LOG.debug("Publishing " + metrics.size() + " metrics to sink.");
+ LOG.debug("Publishing {} metrics to sink.", metrics.size());
metricsSource.publish(metrics);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java
index 7062af1..423b19f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/DatabaseMetricsSource.java
@@ -44,7 +44,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
* and publishes to configured Metric Sink.
**/
public class DatabaseMetricsSource extends AbstractMetricsSource {
- private static Logger LOG = LoggerFactory.getLogger(DatabaseMetricsSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DatabaseMetricsSource.class);
private static String dbMonitorPrefix = "monitor.";
private ExecutorService executor;
private MetricsConfiguration configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java
index 41229cc..348cc4f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java
@@ -46,7 +46,7 @@ import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
*/
public class JvmMetricsSource extends AbstractMetricsSource {
static final MetricRegistry registry = new MetricRegistry();
- private static Logger LOG = LoggerFactory.getLogger(JvmMetricsSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JvmMetricsSource.class);
private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
private static String JVM_PREFIX = "jvm";
private int interval = 10;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsConfiguration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsConfiguration.java
index a940a68..28556f6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsConfiguration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsConfiguration.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
public class MetricsConfiguration {
public static final String CONFIG_FILE = "metrics.properties";
- private static Logger LOG = LoggerFactory.getLogger(MetricsConfiguration.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MetricsConfiguration.class);
private Properties properties;
public static MetricsConfiguration getMetricsConfiguration() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
index ac5b6c2..0172b1d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java
@@ -35,7 +35,7 @@ import com.google.inject.Singleton;
@Singleton
public class MetricsServiceImpl implements MetricsService {
- private static Logger LOG = LoggerFactory.getLogger(MetricsServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MetricsServiceImpl.class);
private static Map<String, MetricsSource> sources = new HashMap<>();
private static MetricsSink sink = null;
private MetricsConfiguration configuration = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 3b07bc6..9077362 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -1299,7 +1299,7 @@ public class DBAccessorImpl implements DBAccessor {
Object dbValue = databasePlatform.convertToDatabaseType(value);
String valueString = value.toString();
if (dbValue instanceof String) {
- valueString = "'" + value.toString() + "'";
+ valueString = "'" + value + "'";
}
return valueString;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
index 297aef4..d71429c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java
@@ -54,7 +54,7 @@ public class AlertDefinitionDAO {
/**
* Logger.
*/
- private static Logger LOG = LoggerFactory.getLogger(AlertDefinitionDAO.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AlertDefinitionDAO.class);
/**
* JPA entity manager
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index e7c9763..9198686 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -82,7 +82,7 @@ import com.google.inject.Provider;
})
@StaticallyInject
public class RepositoryVersionEntity {
- private static Logger LOG = LoggerFactory.getLogger(RepositoryVersionEntity.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RepositoryVersionEntity.class);
@Inject
private static Provider<RepositoryVersionHelper> repositoryVersionHelperProvider;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
index 7e3092d..afa4ac7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
@@ -120,7 +120,7 @@ public class GenericDbmsHelper implements DbmsHelper {
// no writing to file
}
- builder.append(writer.toString());
+ builder.append(writer);
return builder;
}
@@ -435,7 +435,7 @@ public class GenericDbmsHelper implements DbmsHelper {
Object dbValue = databasePlatform.convertToDatabaseType(value);
String valueString = value.toString();
if (dbValue instanceof String || dbValue instanceof Enum) {
- valueString = "'" + value.toString() + "'";
+ valueString = "'" + value + "'";
}
return valueString;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java b/ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java
index 627af41..8fa0f1f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceManager.java
@@ -20,8 +20,8 @@ package org.apache.ambari.server.resources;
import java.io.File;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -31,7 +31,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class ResourceManager {
- private static Log LOG = LogFactory.getLog(ResourceManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceManager.class);
@Inject Configuration configs;
/**
@@ -44,10 +44,7 @@ public class ResourceManager {
String resourcePathIndep = resourcePath.replace("/", File.separator);
File resourceFile = new File(resDir + File.separator + resourcePathIndep);
if (LOG.isDebugEnabled()) {
- LOG.debug("Resource requested from ResourceManager"
- + ", resourceDir=" + resDir
- + ", resourcePath=" + resourcePathIndep
- + ", fileExists=" + resourceFile.exists());
+ LOG.debug("Resource requested from ResourceManager, resourceDir={}, resourcePath={}, fileExists={}", resDir, resourcePathIndep, resourceFile.exists());
}
return resourceFile;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java
index 53266c2..f81c13a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java
@@ -32,8 +32,8 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.ambari.server.resources.ResourceManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@@ -42,7 +42,7 @@ import com.google.inject.Inject;
*/
@Path("/")
public class GetResource {
- private static Log LOG = LogFactory.getLog(GetResource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GetResource.class);
private static ResourceManager resourceManager;
@@ -59,8 +59,7 @@ public class GetResource {
public Response getResource(@PathParam("resourcePath") String resourcePath,
@Context HttpServletRequest req) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Received a resource request from agent"
- + ", resourcePath=" + resourcePath);
+ LOG.debug("Received a resource request from agent, resourcePath={}", resourcePath);
}
File resourceFile = resourceManager.getResource(resourcePath);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java
index 0e6fc7b..4599dfa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/AbstractLinearExecutionJob.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* and then it schedules the follow-up job.
*/
public abstract class AbstractLinearExecutionJob implements ExecutionJob {
- private static Logger LOG = LoggerFactory.getLogger(AbstractLinearExecutionJob.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractLinearExecutionJob.class);
protected ExecutionScheduleManager executionScheduleManager;
public AbstractLinearExecutionJob(ExecutionScheduleManager executionScheduleManager) {
@@ -69,7 +69,7 @@ public abstract class AbstractLinearExecutionJob implements ExecutionJob {
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
JobKey jobKey = context.getJobDetail().getKey();
- LOG.debug("Executing linear job: " + jobKey);
+ LOG.debug("Executing linear job: {}", jobKey);
JobDataMap jobDataMap = context.getMergedJobDataMap();
if (!executionScheduleManager.continueOnMisfire(context)) {
@@ -109,7 +109,7 @@ public abstract class AbstractLinearExecutionJob implements ExecutionJob {
}
}
- LOG.debug("Finished linear job: " + jobKey);
+ LOG.debug("Finished linear job: {}", jobKey);
String nextJobName = jobDataMap.getString(NEXT_EXECUTION_JOB_NAME_KEY);
String nextJobGroup = jobDataMap.getString(NEXT_EXECUTION_JOB_GROUP_KEY);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
index 91f642e..f3b3c41 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
@@ -243,7 +243,7 @@ public class ExecutionScheduleManager {
* @param trigger
*/
public void scheduleJob(Trigger trigger) {
- LOG.debug("Scheduling job: " + trigger.getJobKey());
+ LOG.debug("Scheduling job: {}", trigger.getJobKey());
if (isSchedulerAvailable()) {
try {
executionScheduler.scheduleJob(trigger);
@@ -334,7 +334,7 @@ public class ExecutionScheduleManager {
try {
executionScheduler.scheduleJob(trigger);
- LOG.debug("Scheduled trigger next fire time: " + trigger.getNextFireTime());
+ LOG.debug("Scheduled trigger next fire time: {}", trigger.getNextFireTime());
} catch (SchedulerException e) {
LOG.error("Unable to schedule request execution.", e);
throw new AmbariException(e.getMessage());
@@ -352,7 +352,7 @@ public class ExecutionScheduleManager {
try {
executionScheduler.scheduleJob(trigger);
- LOG.debug("Scheduled trigger next fire time: " + trigger.getNextFireTime());
+ LOG.debug("Scheduled trigger next fire time: {}", trigger.getNextFireTime());
} catch (SchedulerException e) {
LOG.error("Unable to schedule request execution.", e);
throw new AmbariException(e.getMessage());
@@ -412,8 +412,8 @@ public class ExecutionScheduleManager {
}
protected String getJobName(Long executionId, Long orderId) {
- return BATCH_REQUEST_JOB_PREFIX + "-" + executionId.toString() + "-" +
- orderId.toString();
+ return BATCH_REQUEST_JOB_PREFIX + "-" + executionId + "-" +
+ orderId;
}
/**
@@ -492,7 +492,7 @@ public class ExecutionScheduleManager {
String jobName = getJobName(requestExecution.getId(),
batchRequest.getOrderId());
- LOG.debug("Deleting Job, jobName = " + jobName);
+ LOG.debug("Deleting Job, jobName = {}", jobName);
try {
executionScheduler.deleteJob(JobKey.jobKey(jobName,
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionSchedulerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionSchedulerImpl.java
index 6dae349..18c7390 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionSchedulerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionSchedulerImpl.java
@@ -69,7 +69,7 @@ public class ExecutionSchedulerImpl implements ExecutionScheduler {
sf.initialize(properties);
} catch (SchedulerException e) {
LOG.warn("Failed to initialize Request Execution Scheduler properties !");
- LOG.debug("Scheduler properties: \n" + properties);
+ LOG.debug("Scheduler properties: \n{}", properties);
e.printStackTrace();
return;
}
@@ -125,7 +125,7 @@ public class ExecutionSchedulerImpl implements ExecutionScheduler {
// Skip update check
properties.setProperty("org.quartz.scheduler.skipUpdateCheck", "true");
- LOG.debug("Using quartz properties: " + properties);
+ LOG.debug("Using quartz properties: {}", properties);
return properties;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java b/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
index 60d7a52..532c749 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/CertificateManager.java
@@ -90,9 +90,9 @@ public class CertificateManager {
String srvrKstrDir = configsMap.get(Configuration.SRVR_KSTR_DIR.getKey());
String srvrCrtName = configsMap.get(Configuration.SRVR_CRT_NAME.getKey());
File certFile = new File(srvrKstrDir + File.separator + srvrCrtName);
- LOG.debug("srvrKstrDir = " + srvrKstrDir);
- LOG.debug("srvrCrtName = " + srvrCrtName);
- LOG.debug("certFile = " + certFile.getAbsolutePath());
+ LOG.debug("srvrKstrDir = {}", srvrKstrDir);
+ LOG.debug("srvrCrtName = {}", srvrCrtName);
+ LOG.debug("certFile = {}", certFile.getAbsolutePath());
return certFile.exists();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java
index f2f4d4f..a1befa7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurityFilter.java
@@ -31,8 +31,8 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SecurityFilter implements Filter {
@@ -40,7 +40,7 @@ public class SecurityFilter implements Filter {
private static String CA = "/ca";
private static Configuration config;
- private final static Log LOG = LogFactory.getLog(SecurityFilter.class);
+ private final static Logger LOG = LoggerFactory.getLogger(SecurityFilter.class);
@Override
public void destroy() {
@@ -53,7 +53,7 @@ public class SecurityFilter implements Filter {
HttpServletRequest req = (HttpServletRequest) serReq;
String reqUrl = req.getRequestURL().toString();
- LOG.debug("Filtering " + reqUrl + " for security purposes");
+ LOG.debug("Filtering {} for security purposes", reqUrl);
if (serReq.getLocalPort() != config.getTwoWayAuthPort()) {
if (isRequestAllowed(reqUrl)) {
filtCh.doFilter(serReq, serResp);
@@ -63,7 +63,7 @@ public class SecurityFilter implements Filter {
}
}
else {
- LOG.debug("Request can continue on secure port " + serReq.getLocalPort());
+ LOG.debug("Request can continue on secure port {}", serReq.getLocalPort());
filtCh.doFilter(serReq, serResp);
}
}
@@ -98,7 +98,7 @@ public class SecurityFilter implements Filter {
} catch (Exception e) {
LOG.warn("Exception while validating if request is secure " +
- e.toString());
+ e);
}
LOG.warn("Request " + reqUrl + " doesn't match any pattern.");
return false;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
index a6ffa81..54cc978 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
@@ -155,7 +155,7 @@ public class AmbariLdapBindAuthenticator extends AbstractLdapAuthenticator {
throw new BadCredentialsException("The user search facility has not been set.");
} else {
if (LOG.isTraceEnabled()) {
- LOG.trace("Searching for user with username {}: {}", username, userSearch.toString());
+ LOG.trace("Searching for user with username {}: {}", username, userSearch);
}
// Find the user data where the supplied username matches the value of the configured LDAP
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProvider.java
index 0fff8c8..373552e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProvider.java
@@ -55,7 +55,7 @@ public class AmbariPamAuthenticationProvider implements AuthenticationProvider {
@Inject
protected GroupDAO groupDAO;
- private static Logger LOG = LoggerFactory.getLogger(AmbariPamAuthenticationProvider.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AmbariPamAuthenticationProvider.class);
private final Configuration configuration;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/jwt/JwtAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/jwt/JwtAuthenticationFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/jwt/JwtAuthenticationFilter.java
index 258e9da..e27afdb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/jwt/JwtAuthenticationFilter.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/jwt/JwtAuthenticationFilter.java
@@ -265,7 +265,7 @@ public class JwtAuthenticationFilter implements AmbariAuthenticationFilter {
}
String loginURL = authenticationProviderUrl + delimiter
+ originalUrlQueryParam + "="
- + request.getRequestURL().toString();
+ + request.getRequestURL();
return loginURL;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java
index 4763cc2..3b38856 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/encryption/MasterKeyServiceImpl.java
@@ -34,12 +34,12 @@ import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.utils.AmbariPath;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ntp.TimeStamp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MasterKeyServiceImpl implements MasterKeyService {
- private static final Log LOG = LogFactory.getLog(MasterKeyServiceImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MasterKeyServiceImpl.class);
private static final String MASTER_PASSPHRASE = "masterpassphrase";
private static final String MASTER_PERSISTENCE_TAG_PREFIX = "#1.0# ";
private static final AESEncryptor aes = new AESEncryptor(MASTER_PASSPHRASE);
@@ -138,7 +138,7 @@ public class MasterKeyServiceImpl implements MasterKeyService {
* @return true if the master key was written to the specified file; otherwise false
*/
public static boolean initializeMasterKeyFile(File masterKeyFile, String masterKey) {
- LOG.debug(String.format("Persisting master key into %s", masterKeyFile.getAbsolutePath()));
+ LOG.debug("Persisting master key into {}", masterKeyFile.getAbsolutePath());
EncryptionResult atom = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java
index b1ad05f..eddc6bb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java
@@ -24,14 +24,14 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.ambari.server.security.CertificateManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@Path("/cert/ca")
public class CertificateDownload {
- private static Log LOG = LogFactory.getLog(CertificateDownload.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CertificateDownload.class);
private static CertificateManager certMan;
@Inject
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java
index 9f4cdd5..5e2d45a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java
@@ -30,13 +30,13 @@ import javax.ws.rs.core.MediaType;
import org.apache.ambari.server.security.CertificateManager;
import org.apache.ambari.server.security.SignCertResponse;
import org.apache.ambari.server.security.SignMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@Path("/certs")
public class CertificateSign {
- private static Log LOG = LogFactory.getLog(CertificateSign.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CertificateSign.class);
private static CertificateManager certMan;
@Inject
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java
index 6bce0b9..ac2e536 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java
@@ -26,15 +26,15 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.ambari.server.configuration.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
@Path("/connection_info")
public class ConnectionInfo {
- private static Log LOG = LogFactory.getLog(ConnectionInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectionInfo.class);
private static HashMap<String,String> response= new HashMap<>();
private static Configuration conf;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
index 8903fa1..f7d6060 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
@@ -54,13 +54,13 @@ import org.apache.ambari.server.security.InternalSSLSocketFactoryTrusting;
import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
@@ -71,7 +71,7 @@ import com.google.inject.Inject;
*/
public class ADKerberosOperationHandler extends KerberosOperationHandler {
- private static Log LOG = LogFactory.getLog(ADKerberosOperationHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ADKerberosOperationHandler.class);
private static final String LDAP_CONTEXT_FACTORY_CLASS = "com.sun.jndi.ldap.LdapCtxFactory";
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 9ee5f11..a23ab5d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -288,7 +288,7 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction {
commandReport = createCommandReport(1, HostRoleStatus.FAILED, "{}", actionLog.getStdOut(), actionLog.getStdErr());
}
} else {
- LOG.debug(String.format("Skipping previously processed keytab for %s on host %s", evaluatedPrincipal, hostName));
+ LOG.debug("Skipping previously processed keytab for {} on host {}", evaluatedPrincipal, hostName);
}
}
}
@@ -320,7 +320,7 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction {
public Keytab createKeytab(String principal, String password, Integer keyNumber,
KerberosOperationHandler operationHandler, boolean checkCache,
boolean canCache, ActionLog actionLog) throws AmbariException {
- LOG.debug("Creating keytab for " + principal + " with kvno " + keyNumber);
+ LOG.debug("Creating keytab for {} with kvno {}", principal, keyNumber);
Keytab keytab = null;
// Possibly get the keytab from the cache
@@ -366,7 +366,7 @@ public class CreateKeytabFilesServerAction extends KerberosServerAction {
if (previousCachedFilePath != null) {
if (!new File(previousCachedFilePath).delete()) {
- LOG.debug(String.format("Failed to remove orphaned cache file %s", previousCachedFilePath));
+ LOG.debug("Failed to remove orphaned cache file {}", previousCachedFilePath);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
index fc2de99..2b3a0ca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DestroyPrincipalsServerAction.java
@@ -133,7 +133,7 @@ public class DestroyPrincipalsServerAction extends KerberosServerAction {
// If a cached keytabs file exists for this principal, delete it.
if (cachedKeytabPath != null) {
if (!new File(cachedKeytabPath).delete()) {
- LOG.debug(String.format("Failed to remove cached keytab for %s", evaluatedPrincipal));
+ LOG.debug("Failed to remove cached keytab for {}", evaluatedPrincipal);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
index 54b4cd3..9a6a07e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
@@ -405,7 +405,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
ShellCommandUtil.Result result = invokeIpa(String.format("service-show %s", principal));
// ignore the keytab but set the password for this principal
if (result.isSuccessful() && result.getStdout().contains("Keytab: False")) {
- LOG.debug("Found service principal " + principal + " without password/keytab. Setting one");
+ LOG.debug("Found service principal {} without password/keytab. Setting one", principal);
createKeytab(principal, password, 0);
}
}
@@ -505,7 +505,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
stderr.read(err_data);
err.append(err_data);
}
- throw new KerberosOperationException("No answer data available from stdin stream. STDERR: " + err.toString());
+ throw new KerberosOperationException("No answer data available from stdin stream. STDERR: " + err);
}
count++;
}
@@ -534,12 +534,12 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
BufferedReader stderr = null;
OutputStreamWriter out = null;
- LOG.debug("Updating password for: " + principal);
+ LOG.debug("Updating password for: {}", principal);
UUID uuid = UUID.randomUUID();
String fileName = System.getProperty("java.io.tmpdir") +
File.pathSeparator +
- "krb5cc_" + uuid.toString();
+ "krb5cc_" + uuid;
try {
ShellCommandUtil.Result result = invokeIpa(String.format("user-mod %s --random", principal));
@@ -665,7 +665,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
command.add(query);
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executing: %s", createCleanCommand(command)));
+ LOG.debug("Executing: {}", createCleanCommand(command));
}
List<String> fixedCommand = fixCommandList(command);
@@ -962,7 +962,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
UUID uuid = UUID.randomUUID();
String fileName = System.getProperty("java.io.tmpdir") +
File.pathSeparator +
- "ambari." + uuid.toString();
+ "ambari." + uuid;
// TODO: add ciphers
List<String> command = new ArrayList<>();
@@ -1007,7 +1007,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
UUID uuid = UUID.randomUUID();
fileName = System.getProperty("java.io.tmpdir") +
File.pathSeparator +
- "krb5cc_" + uuid.toString();
+ "krb5cc_" + uuid;
env.put("KRB5CCNAME", String.format("FILE:%s", fileName));
init(credentials, fileName);
@@ -1049,7 +1049,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
try {
String credentialsCache = String.format("FILE:%s", fileName);
- LOG.debug("start subprocess " + executableKinit + " " + credentials.getPrincipal());
+ LOG.debug("start subprocess {} {}", executableKinit, credentials.getPrincipal());
process = Runtime.getRuntime().exec(new String[]{executableKinit, "-c", credentialsCache, credentials.getPrincipal()});
reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
osw = new OutputStreamWriter(process.getOutputStream());
@@ -1073,7 +1073,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
}
String line = sb.toString();
- LOG.debug("Reading a line: " + line);
+ LOG.debug("Reading a line: {}", line);
if (!line.startsWith("Password")) {
throw new KerberosOperationException("Unexpected response from kinit while trying to get ticket for "
+ credentials.getPrincipal() + " got: " + line);
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
index 55d7366..0997f65 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandler.java
@@ -454,7 +454,7 @@ public class MITKerberosOperationHandler extends KerberosOperationHandler {
command.add(query);
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("Executing: %s", command));
+ LOG.debug("Executing: {}", command);
}
int retryCount = configuration.getKerberosOperationRetries();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
index 17bb3f8..ec4d383 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
@@ -86,7 +86,7 @@ import com.google.inject.Provider;
*/
public class ConfigureAction extends AbstractUpgradeServerAction {
- private static Logger LOG = LoggerFactory.getLogger(ConfigureAction.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigureAction.class);
/**
* Used to lookup the cluster.
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index db0da9c..3c2dbd6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -319,7 +319,7 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
} catch (Exception e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- errSB.append(sw.toString());
+ errSB.append(sw);
return createCommandReport(-1, HostRoleStatus.FAILED, "{}", outSB.toString(), errSB.toString());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java
index f55ffd0..8a4820d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredStackAction.java
@@ -181,7 +181,7 @@ public class UpdateDesiredStackAction extends AbstractUpgradeServerAction {
} catch (Exception e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- err.append(sw.toString());
+ err.append(sw);
return createCommandReport(-1, HostRoleStatus.FAILED, "{}", out.toString(), err.toString());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
index 1f6ce2c..131318b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionDirectory.java
@@ -133,7 +133,7 @@ public class ExtensionDirectory extends StackDefinitionDirectory {
//todo: is it ok for this file not to exist?
if (extensionMetaInfoFile.exists()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Reading extension version metainfo from file " + extensionMetaInfoFile.getAbsolutePath());
+ LOG.debug("Reading extension version metainfo from file {}", extensionMetaInfoFile.getAbsolutePath());
}
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
index ee4245a..409cfe6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
@@ -379,9 +379,7 @@ public class ExtensionModule extends BaseModule<ExtensionModule, ExtensionInfo>
id = String.format("%s:%s", extensionInfo.getName(), extensionInfo.getVersion());
- LOG.debug("Adding new extension to known extensions"
- + ", extensionName = " + extensionInfo.getName()
- + ", extensionVersion = " + extensionInfo.getVersion());
+ LOG.debug("Adding new extension to known extensions, extensionName = {}, extensionVersion = {}", extensionInfo.getName(), extensionInfo.getVersion());
//todo: give additional thought on handling missing metainfo.xml
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
index d38e4a3..427a5f5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
@@ -52,7 +52,7 @@ import com.google.common.reflect.TypeToken;
public class MasterHostResolver {
- private static Logger LOG = LoggerFactory.getLogger(MasterHostResolver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MasterHostResolver.class);
private final UpgradeContext m_upgradeContext;
private final Cluster m_cluster;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
index e4dd853..abad7ed 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
@@ -421,7 +421,7 @@ public abstract class ServiceDirectory extends StackDefinitionDirectory {
roleCommandOrder = new StackRoleCommandOrder(result);
if (LOG.isDebugEnabled() && rcoFile != null) {
- LOG.debug("Role Command Order for " + rcoFile.getAbsolutePath());
+ LOG.debug("Role Command Order for {}", rcoFile.getAbsolutePath());
roleCommandOrder.printRoleCommandOrder(LOG);
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
index 7dbc639..e41d3b2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
@@ -629,9 +629,9 @@ public class ServiceModule extends BaseModule<ServiceModule, ServiceInfo> implem
* Ensure that all default type attributes are set.
*/
private void finalizeConfiguration() {
- LOG.debug(String.format("Finalize config, number of configuration modules %s", configurationModules.size()));
+ LOG.debug("Finalize config, number of configuration modules {}", configurationModules.size());
hasConfigs = !(configurationModules.isEmpty());
- LOG.debug(String.format("Finalize config, hasConfigs %s", hasConfigs));
+ LOG.debug("Finalize config, hasConfigs {}", hasConfigs);
for (ConfigurationModule config : configurationModules.values()) {
ConfigurationInfo configInfo = config.getModuleInfo();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
index 16c8fd6..23fd0a9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
@@ -286,8 +286,7 @@ public class StackDirectory extends StackDefinitionDirectory {
hooksDir = getStackDirName() + File.separator + getName() +
File.separator + HOOKS_FOLDER_NAME;
} else {
- LOG.debug("Hooks folder " + getAbsolutePath() + File.separator +
- HOOKS_FOLDER_NAME + " does not exist");
+ LOG.debug("Hooks folder {}{}" + HOOKS_FOLDER_NAME + " does not exist", getAbsolutePath(), File.separator);
}
if (subDirs.contains(AmbariMetaInfo.RCO_FILE_NAME)) {
@@ -342,7 +341,7 @@ public class StackDirectory extends StackDefinitionDirectory {
//todo: is it ok for this file not to exist?
if (stackMetaInfoFile.exists()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Reading stack version metainfo from file " + stackMetaInfoFile.getAbsolutePath());
+ LOG.debug("Reading stack version metainfo from file {}", stackMetaInfoFile.getAbsolutePath());
}
try {
@@ -492,7 +491,7 @@ public class StackDirectory extends StackDefinitionDirectory {
}
roleCommandOrder = new StackRoleCommandOrder(result);
if (LOG.isDebugEnabled()) {
- LOG.debug("Role Command Order for " + rcoFilePath);
+ LOG.debug("Role Command Order for {}", rcoFilePath);
roleCommandOrder.printRoleCommandOrder(LOG);
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
index d9649b9..57f7cb4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
@@ -465,8 +465,7 @@ public class StackManager {
String commonServicesRootAbsolutePath = commonServicesRoot.getAbsolutePath();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loading common services information"
- + ", commonServicesRoot = " + commonServicesRootAbsolutePath);
+ LOG.debug("Loading common services information, commonServicesRoot = {}", commonServicesRootAbsolutePath);
}
if (!commonServicesRoot.isDirectory() && !commonServicesRoot.exists()) {
@@ -488,8 +487,7 @@ public class StackManager {
String stackRootAbsPath = stackRoot.getAbsolutePath();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loading stack information"
- + ", stackRoot = " + stackRootAbsPath);
+ LOG.debug("Loading stack information, stackRoot = {}", stackRootAbsPath);
}
if (!stackRoot.isDirectory() && !stackRoot.exists()) {
@@ -544,8 +542,7 @@ public class StackManager {
String extensionRootAbsPath = extensionRoot.getAbsolutePath();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loading extension information"
- + ", extensionRoot = " + extensionRootAbsPath);
+ LOG.debug("Loading extension information, extensionRoot = {}", extensionRootAbsPath);
}
//For backwards compatibility extension directory may not exist
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
index 5dd7656..c4fab99 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
@@ -554,9 +554,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
id = String.format("%s:%s", stackInfo.getName(), stackInfo.getVersion());
- LOG.debug("Adding new stack to known stacks"
- + ", stackName = " + stackInfo.getName()
- + ", stackVersion = " + stackInfo.getVersion());
+ LOG.debug("Adding new stack to known stacks, stackName = {}, stackVersion = {}", stackInfo.getName(), stackInfo.getVersion());
//todo: give additional thought on handling missing metainfo.xml
StackMetainfoXml smx = stackDirectory.getMetaInfoFile();
@@ -1014,7 +1012,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
String name = groups.get(index).name;
if (name.equals(group.addAfterGroup)) {
groups.add(index + 1, group);
- LOG.debug("Added group/after: " + group.name + "/" + group.addAfterGroup);
+ LOG.debug("Added group/after: {}/{}", group.name, group.addAfterGroup);
return true;
}
}
@@ -1126,10 +1124,8 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
if (null != rxml) {
stackInfo.setRepositoryXml(rxml);
- LOG.debug("Adding repositories to stack" +
- ", stackName=" + stackInfo.getName() +
- ", stackVersion=" + stackInfo.getVersion() +
- ", repoFolder=" + stackDirectory.getRepoDir());
+ LOG.debug("Adding repositories to stack, stackName={}, stackVersion={}, repoFolder={}",
+ stackInfo.getName(), stackInfo.getVersion(), stackDirectory.getRepoDir());
stackRepos = rxml.getRepositories();
@@ -1265,8 +1261,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding repo to stack"
- + ", repoInfo=" + ri.toString());
+ LOG.debug("Adding repo to stack, repoInfo={}", ri);
}
return ri;
}
@@ -1293,8 +1288,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
stackInfo.getRoleCommandOrder().merge(service.getModuleInfo().getRoleCommandOrder(), true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Role Command Order for " + stackInfo.getName() + "-" + stackInfo.getVersion() +
- " service " + service.getModuleInfo().getName());
+ LOG.debug("Role Command Order for {}-{} service {}", stackInfo.getName(), stackInfo.getVersion(), service.getModuleInfo().getName());
stackInfo.getRoleCommandOrder().printRoleCommandOrder(LOG);
}
}
@@ -1306,7 +1300,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V
private void validateBulkCommandComponents(Map<String, StackModule> allStacks){
if (null != stackInfo) {
String currentStackId = stackInfo.getName() + StackManager.PATH_DELIMITER + stackInfo.getVersion();
- LOG.debug("Validate bulk command components for: " + currentStackId);
+ LOG.debug("Validate bulk command components for: {}", currentStackId);
StackModule currentStack = allStacks.get(currentStackId);
if (null != currentStack){
for (ServiceModule serviceModule : currentStack.getServiceModules().values()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java b/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
index d6d26c9..b508cd7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
@@ -42,7 +42,7 @@ import com.google.inject.assistedinject.AssistedInject;
public class RoleGraph {
- private static Logger LOG = LoggerFactory.getLogger(RoleGraph.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RoleGraph.class);
Map<String, RoleGraphNode> graph = null;
private RoleCommandOrder roleDependencies;
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
index f3fbc63..8cf3afd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/CheckHelper.java
@@ -50,7 +50,7 @@ public class CheckHelper {
/**
* Log.
*/
- private static Logger LOG = LoggerFactory.getLogger(CheckHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CheckHelper.class);
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index a2af9ec..5f85e38 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -225,11 +225,8 @@ public class ServiceComponentImpl implements ServiceComponent {
@Override
public void setRecoveryEnabled(boolean recoveryEnabled) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting RecoveryEnabled of Component" + ", clusterName="
- + service.getCluster().getClusterName() + ", clusterId="
- + service.getCluster().getClusterId() + ", serviceName=" + service.getName()
- + ", componentName=" + getName() + ", oldRecoveryEnabled=" + isRecoveryEnabled()
- + ", newRecoveryEnabled=" + recoveryEnabled);
+ LOG.debug("Setting RecoveryEnabled of Component, clusterName={}, clusterId={}, serviceName={}, componentName={}, oldRecoveryEnabled={}, newRecoveryEnabled={}",
+ service.getCluster().getClusterName(), service.getCluster().getClusterId(), service.getName(), getName(), isRecoveryEnabled(), recoveryEnabled);
}
ServiceComponentDesiredStateEntity desiredStateEntity = serviceComponentDesiredStateDAO.findById(
@@ -289,11 +286,8 @@ public class ServiceComponentImpl implements ServiceComponent {
// TODO validation
// TODO ensure host belongs to cluster
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding a ServiceComponentHost to ServiceComponent" + ", clusterName="
- + service.getCluster().getClusterName() + ", clusterId="
- + service.getCluster().getClusterId() + ", serviceName=" + service.getName()
- + ", serviceComponentName=" + getName() + ", hostname=" + hostComponent.getHostName()
- + ", recoveryEnabled=" + isRecoveryEnabled());
+ LOG.debug("Adding a ServiceComponentHost to ServiceComponent, clusterName={}, clusterId={}, serviceName={}, serviceComponentName={}, hostname={}, recoveryEnabled={}",
+ service.getCluster().getClusterName(), service.getCluster().getClusterId(), service.getName(), getName(), hostComponent.getHostName(), isRecoveryEnabled());
}
if (hostComponents.containsKey(hostComponent.getHostName())) {
@@ -350,11 +344,8 @@ public class ServiceComponentImpl implements ServiceComponent {
@Override
public void setDesiredState(State state) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting DesiredState of Service" + ", clusterName="
- + service.getCluster().getClusterName() + ", clusterId="
- + service.getCluster().getClusterId() + ", serviceName=" + service.getName()
- + ", serviceComponentName=" + getName() + ", oldDesiredState=" + getDesiredState()
- + ", newDesiredState=" + state);
+ LOG.debug("Setting DesiredState of Service, clusterName={}, clusterId={}, serviceName={}, serviceComponentName={}, oldDesiredState={}, newDesiredState={}",
+ service.getCluster().getClusterName(), service.getCluster().getClusterId(), service.getName(), getName(), getDesiredState(), state);
}
ServiceComponentDesiredStateEntity desiredStateEntity = serviceComponentDesiredStateDAO.findById(
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
index fe37a93..da1702d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
@@ -266,11 +266,8 @@ public class ServiceImpl implements Service {
@Override
public void setDesiredState(State state) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting DesiredState of Service" + ", clusterName="
- + cluster.getClusterName() + ", clusterId="
- + cluster.getClusterId() + ", serviceName=" + getName()
- + ", oldDesiredState=" + getDesiredState() + ", newDesiredState="
- + state);
+ LOG.debug("Setting DesiredState of Service, clusterName={}, clusterId={}, serviceName={}, oldDesiredState={}, newDesiredState={}",
+ cluster.getClusterName(), cluster.getClusterId(), getName(), getDesiredState(), state);
}
ServiceDesiredStateEntity serviceDesiredStateEntity = getServiceDesiredStateEntity();
@@ -291,11 +288,8 @@ public class ServiceImpl implements Service {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting DesiredSecurityState of Service" + ", clusterName="
- + cluster.getClusterName() + ", clusterId="
- + cluster.getClusterId() + ", serviceName=" + getName()
- + ", oldDesiredSecurityState=" + getSecurityState()
- + ", newDesiredSecurityState=" + securityState);
+ LOG.debug("Setting DesiredSecurityState of Service, clusterName={}, clusterId={}, serviceName={}, oldDesiredSecurityState={}, newDesiredSecurityState={}",
+ cluster.getClusterName(), cluster.getClusterId(), getName(), getSecurityState(), securityState);
}
ServiceDesiredStateEntity serviceDesiredStateEntity = getServiceDesiredStateEntity();
serviceDesiredStateEntity.setSecurityState(securityState);
@@ -429,11 +423,8 @@ public class ServiceImpl implements Service {
@Override
public void setCredentialStoreEnabled(boolean credentialStoreEnabled) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Setting CredentialStoreEnabled of Service" + ", clusterName="
- + cluster.getClusterName() + ", clusterId="
- + cluster.getClusterId() + ", serviceName=" + getName()
- + ", oldCredentialStoreEnabled=" + isCredentialStoreEnabled()
- + ", newCredentialStoreEnabled=" + credentialStoreEnabled);
+ LOG.debug("Setting CredentialStoreEnabled of Service, clusterName={}, clusterId={}, serviceName={}, oldCredentialStoreEnabled={}, newCredentialStoreEnabled={}",
+ cluster.getClusterName(), cluster.getClusterId(), getName(), isCredentialStoreEnabled(), credentialStoreEnabled);
}
ServiceDesiredStateEntity desiredStateEntity = getServiceDesiredStateEntity();
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
index ca7794e..1494488 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/StackInfo.java
@@ -295,7 +295,7 @@ public class StackInfo implements Comparable<StackInfo>, Validable {
sb.append("\n\t\tRepositories:");
for (RepositoryInfo repository : repositories) {
sb.append("\t\t");
- sb.append(repository.toString());
+ sb.append(repository);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java
index b42a0b6..35b559e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionImpl.java
@@ -26,12 +26,12 @@ import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
import org.apache.ambari.server.state.fsm.SingleArcTransition;
import org.apache.ambari.server.state.fsm.StateMachine;
import org.apache.ambari.server.state.fsm.StateMachineFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ActionImpl implements Action {
- private static final Log LOG = LogFactory.getLog(ActionImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionImpl.class);
private final Lock readLock;
private final Lock writeLock;
@@ -125,10 +125,8 @@ public class ActionImpl implements Action {
ActionProgressUpdateEvent e = (ActionProgressUpdateEvent) event;
action.setLastUpdateTime(e.getProgressUpdateTime());
if (LOG.isDebugEnabled()) {
- LOG.debug("Progress update for Action"
- + ", actionId=" + action.getId()
- + ", startTime=" + action.getStartTime()
- + ", lastUpdateTime=" + action.getLastUpdateTime());
+ LOG.debug("Progress update for Action, actionId={}, startTime={}, lastUpdateTime={}",
+ action.getId(), action.getStartTime(), action.getLastUpdateTime());
}
}
}
@@ -193,8 +191,7 @@ public class ActionImpl implements Action {
public void handleEvent(ActionEvent event)
throws InvalidStateTransitionException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling Action event, eventType=" + event.getType().name()
- + ", event=" + event.toString());
+ LOG.debug("Handling Action event, eventType={}, event={}", event.getType().name(), event);
}
ActionState oldState = getState();
try {
@@ -215,12 +212,8 @@ public class ActionImpl implements Action {
}
if (oldState != getState()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Action transitioned to a new state"
- + ", actionId=" + this.getId()
- + ", oldState=" + oldState
- + ", currentState=" + getState()
- + ", eventType=" + event.getType().name()
- + ", event=" + event);
+ LOG.debug("Action transitioned to a new state, actionId={}, oldState={}, currentState={}, eventType={}, event={}",
+ getId(), oldState, getState(), event.getType().name(), event);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 8f33f1a..a4bf815 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -465,16 +465,13 @@ public class ClusterImpl implements Cluster {
}
}
- LOG.debug("Adding a new Config group" + ", clusterName = "
- + getClusterName() + ", groupName = " + configGroup.getName()
- + ", tag = " + configGroup.getTag() + " with hosts " + hostList);
+ LOG.debug("Adding a new Config group, clusterName = {}, groupName = {}, tag = {} with hosts {}",
+ getClusterName(), configGroup.getName(), configGroup.getTag(), hostList);
if (clusterConfigGroups.containsKey(configGroup.getId())) {
// The loadConfigGroups will load all groups to memory
- LOG.debug("Config group already exists" + ", clusterName = "
- + getClusterName() + ", groupName = " + configGroup.getName()
- + ", groupId = " + configGroup.getId() + ", tag = "
- + configGroup.getTag());
+ LOG.debug("Config group already exists, clusterName = {}, groupName = {}, groupId = {}, tag = {}",
+ getClusterName(), configGroup.getName(), configGroup.getId(), configGroup.getTag());
} else {
clusterConfigGroups.put(configGroup.getId(), configGroup);
}
@@ -509,9 +506,8 @@ public class ClusterImpl implements Cluster {
+ requestExecution.getId() + ", description = " + requestExecution.getDescription());
if (requestExecutions.containsKey(requestExecution.getId())) {
- LOG.debug(
- "Request schedule already exists" + ", clusterName = " + getClusterName() + ", id = "
- + requestExecution.getId() + ", description = " + requestExecution.getDescription());
+ LOG.debug("Request schedule already exists, clusterName = {}, id = {}, description = {}",
+ getClusterName(), requestExecution.getId(), requestExecution.getDescription());
} else {
requestExecutions.put(requestExecution.getId(), requestExecution);
}
@@ -542,9 +538,8 @@ public class ClusterImpl implements Cluster {
throw new ConfigGroupNotFoundException(getClusterName(), id.toString());
}
- LOG.debug("Deleting Config group" + ", clusterName = " + getClusterName()
- + ", groupName = " + configGroup.getName() + ", groupId = "
- + configGroup.getId() + ", tag = " + configGroup.getTag());
+ LOG.debug("Deleting Config group, clusterName = {}, groupName = {}, groupId = {}, tag = {}",
+ getClusterName(), configGroup.getName(), configGroup.getId(), configGroup.getTag());
configGroup.delete();
clusterConfigGroups.remove(id);
@@ -666,10 +661,8 @@ public class ClusterImpl implements Cluster {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding a new ServiceComponentHost" + ", clusterName="
- + getClusterName() + ", clusterId=" + getClusterId()
- + ", serviceName=" + serviceName + ", serviceComponentName"
- + componentName + ", hostname= " + hostname);
+ LOG.debug("Adding a new ServiceComponentHost, clusterName={}, clusterId={}, serviceName={}, serviceComponentName{}, hostname= {}",
+ getClusterName(), getClusterId(), serviceName, componentName, hostname);
}
serviceComponentHosts.get(serviceName).get(componentName).put(hostname,
@@ -742,10 +735,8 @@ public class ClusterImpl implements Cluster {
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Removing a ServiceComponentHost" + ", clusterName="
- + getClusterName() + ", clusterId=" + getClusterId()
- + ", serviceName=" + serviceName + ", serviceComponentName"
- + componentName + ", hostname= " + hostname);
+ LOG.debug("Removing a ServiceComponentHost, clusterName={}, clusterId={}, serviceName={}, serviceComponentName{}, hostname= {}",
+ getClusterName(), getClusterId(), serviceName, componentName, hostname);
}
serviceComponentHosts.get(serviceName).get(componentName).remove(hostname);
@@ -830,8 +821,7 @@ public class ClusterImpl implements Cluster {
@Override
public void addService(Service service) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding a new Service" + ", clusterName=" + getClusterName() + ", clusterId="
- + getClusterId() + ", serviceName=" + service.getName());
+ LOG.debug("Adding a new Service, clusterName={}, clusterId={}, serviceName={}", getClusterName(), getClusterId(), service.getName());
}
services.put(service.getName(), service);
}
@@ -894,10 +884,8 @@ public class ClusterImpl implements Cluster {
clusterGlobalLock.writeLock().lock();
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Changing DesiredStackVersion of Cluster" + ", clusterName="
- + getClusterName() + ", clusterId=" + getClusterId()
- + ", currentDesiredStackVersion=" + desiredStackVersion
- + ", newDesiredStackVersion=" + stackId);
+ LOG.debug("Changing DesiredStackVersion of Cluster, clusterName={}, clusterId={}, currentDesiredStackVersion={}, newDesiredStackVersion={}",
+ getClusterName(), getClusterId(), desiredStackVersion, stackId);
}
desiredStackVersion = stackId;
@@ -2376,7 +2364,8 @@ public class ClusterImpl implements Cluster {
LOG.info("Setting {} with version tag {} created on {} to selected for stack {}",
entity.getType(), entity.getTag(), new Date(entity.getTimestamp()),
- stackId.toString());
+ stackId
+ );
}
// since the entities which were modified came from the cluster entity's
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
index 5f1e934..595ce4a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
@@ -305,9 +305,7 @@ public class ClustersImpl implements Clusters {
throw new HostNotFoundException(hostname);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Looking up clusters for hostname"
- + ", hostname=" + hostname
- + ", mappedClusters=" + clusters.size());
+ LOG.debug("Looking up clusters for hostname, hostname={}, mappedClusters={}", hostname, clusters.size());
}
return Collections.unmodifiableSet(clusters);
@@ -397,7 +395,7 @@ public class ClustersImpl implements Clusters {
Collections.newSetFromMap(new ConcurrentHashMap<Cluster, Boolean>()));
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding a host to Clusters" + ", hostname=" + hostname);
+ LOG.debug("Adding a host to Clusters, hostname={}", hostname);
}
// publish the event
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 04aba31..aa87f7d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -327,7 +327,7 @@ public class HostImpl implements Host {
agentVersion = e.agentVersion.getVersion();
}
LOG.info("Received host registration, host="
- + e.hostInfo.toString()
+ + e.hostInfo
+ ", registrationTime=" + e.registrationTime
+ ", agentVersion=" + agentVersion);
@@ -355,9 +355,7 @@ public class HostImpl implements Host {
public void transition(HostImpl host, HostEvent event) {
HostStatusUpdatesReceivedEvent e = (HostStatusUpdatesReceivedEvent)event;
// TODO Audit logs
- LOG.debug("Host transition to host status updates received state"
- + ", host=" + e.getHostName()
- + ", heartbeatTime=" + e.getTimestamp());
+ LOG.debug("Host transition to host status updates received state, host={}, heartbeatTime={}", e.getHostName(), e.getTimestamp());
host.setHealthStatus(new HostHealthStatus(HealthStatus.HEALTHY,
host.getHealthStatus().getHealthReport()));
}
@@ -404,9 +402,7 @@ public class HostImpl implements Host {
HostHealthyHeartbeatEvent e = (HostHealthyHeartbeatEvent) event;
host.setLastHeartbeatTime(e.getHeartbeatTime());
// TODO Audit logs
- LOG.debug("Host transitioned to a healthy state"
- + ", host=" + e.getHostName()
- + ", heartbeatTime=" + e.getHeartbeatTime());
+ LOG.debug("Host transitioned to a healthy state, host={}, heartbeatTime={}", e.getHostName(), e.getHeartbeatTime());
host.setHealthStatus(new HostHealthStatus(HealthStatus.HEALTHY, host.getHealthStatus().getHealthReport()));
}
}
@@ -419,10 +415,8 @@ public class HostImpl implements Host {
HostUnhealthyHeartbeatEvent e = (HostUnhealthyHeartbeatEvent) event;
host.setLastHeartbeatTime(e.getHeartbeatTime());
// TODO Audit logs
- LOG.debug("Host transitioned to an unhealthy state"
- + ", host=" + e.getHostName()
- + ", heartbeatTime=" + e.getHeartbeatTime()
- + ", healthStatus=" + e.getHealthStatus());
+ LOG.debug("Host transitioned to an unhealthy state, host={}, heartbeatTime={}, healthStatus={}",
+ e.getHostName(), e.getHeartbeatTime(), e.getHealthStatus());
host.setHealthStatus(e.getHealthStatus());
}
}
@@ -434,9 +428,7 @@ public class HostImpl implements Host {
public void transition(HostImpl host, HostEvent event) {
HostHeartbeatLostEvent e = (HostHeartbeatLostEvent) event;
// TODO Audit logs
- LOG.debug("Host transitioned to heartbeat lost state"
- + ", host=" + e.getHostName()
- + ", lastHeartbeatTime=" + host.getLastHeartbeatTime());
+ LOG.debug("Host transitioned to heartbeat lost state, host={}, lastHeartbeatTime={}", e.getHostName(), host.getLastHeartbeatTime());
host.setHealthStatus(new HostHealthStatus(HealthStatus.UNKNOWN, host.getHealthStatus().getHealthReport()));
host.topologyManager.onHostHeartBeatLost(host);
@@ -568,8 +560,7 @@ public class HostImpl implements Host {
public void handleEvent(HostEvent event)
throws InvalidStateTransitionException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Handling Host event, eventType=" + event.getType().name()
- + ", event=" + event.toString());
+ LOG.debug("Handling Host event, eventType={}, event={}", event.getType().name(), event);
}
HostState oldState = getState();
try {
@@ -590,12 +581,8 @@ public class HostImpl implements Host {
}
if (oldState != getState()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Host transitioned to a new state"
- + ", host=" + getHostName()
- + ", oldState=" + oldState
- + ", currentState=" + getState()
- + ", eventType=" + event.getType().name()
- + ", event=" + event);
+ LOG.debug("Host transitioned to a new state, host={}, oldState={}, currentState={}, eventType={}, event={}",
+ getHostName(), oldState, getState(), event.getType().name(), event);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/219f2234/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java
index c5a7e18..db02e95 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ConfigUpgradePack.java
@@ -58,7 +58,7 @@ public class ConfigUpgradePack {
*/
private Map<String, ConfigUpgradeChangeDefinition> changesById;
- private static Logger LOG = LoggerFactory.getLogger(ConfigUpgradePack.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConfigUpgradePack.class);
/**
* no-arg default constructor for JAXB