You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/06/02 17:15:02 UTC
git commit: remove some deprecations in use of SnakeYaml patch by
dbrosius reviewed by jbellis for cassandra-5606
Updated Branches:
refs/heads/trunk 4303dfa5e -> 19ad1ca4b
remove some deprecations in use of SnakeYaml
patch by dbrosius reviewed by jbellis for cassandra-5606
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19ad1ca4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19ad1ca4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19ad1ca4
Branch: refs/heads/trunk
Commit: 19ad1ca4beca31ded9ee7111fc302b0f3e21a269
Parents: 4303dfa
Author: Dave Brosius <db...@apache.org>
Authored: Sun Jun 2 11:13:40 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Jun 2 11:13:40 2013 -0400
----------------------------------------------------------------------
.../cassandra/config/YamlConfigurationLoader.java | 2 +-
.../locator/YamlFileNetworkTopologySnitch.java | 2 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ad1ca4/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index a9934ab..2eb4e6e 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -84,7 +84,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
constructor.addTypeDescription(seedDesc);
- Yaml yaml = new Yaml(new Loader(constructor));
+ Yaml yaml = new Yaml(constructor);
return (Config)yaml.load(input);
}
catch (YAMLException e)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ad1ca4/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
index d258b90..e430435 100644
--- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
+++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java
@@ -326,7 +326,7 @@ public class YamlFileNetworkTopologySnitch
TopologyConfig topologyConfig;
try
{
- yaml = new Yaml(new Loader(configConstructor));
+ yaml = new Yaml(configConstructor);
topologyConfig = (TopologyConfig) yaml.load(configFileInputStream);
}
finally
http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ad1ca4/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 2af02ea..ca81857 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -185,9 +185,7 @@ public class NodeCmd
try
{
final Constructor constructor = new Constructor(NodeToolHelp.class);
- TypeDescription desc = new TypeDescription(NodeToolHelp.class);
- desc.putListPropertyType("commands", NodeToolHelp.NodeToolCommand.class);
- final Yaml yaml = new Yaml(new Loader(constructor));
+ final Yaml yaml = new Yaml(constructor);
return (NodeToolHelp)yaml.load(is);
}
finally