You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2020/04/09 15:47:35 UTC

[incubator-heron] branch master updated: Fix snake yaml that caused unit test failures (#3506)

This is an automated email from the ASF dual-hosted git repository.

nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/master by this push:
     new c024da2  Fix snake yaml that caused unit test failures (#3506)
c024da2 is described below

commit c024da268031f49dc2311adb1e3a258fe136c8e6
Author: Ning Wang <nw...@twitter.com>
AuthorDate: Thu Apr 9 08:47:12 2020 -0700

    Fix snake yaml that caused unit test failures (#3506)
    
    Fix snakeyaml caused unit test failures
---
 README.md                                                      |  1 +
 .../org/apache/heron/apiserver/utils/ConfigUtilsTests.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c221c3e..af8a9a4 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ Heron is realtime analytics platform developed by Twitter.  It has a wide array
 ### Documentation
 
 [https://heron.incubator.apache.org/](https://heron.incubator.apache.org/)
+Confluence: https://cwiki.apache.org/confluence/display/HERON
 
 #### Heron Requirements:
  * Java 11
diff --git a/heron/tools/apiserver/tests/java/org/apache/heron/apiserver/utils/ConfigUtilsTests.java b/heron/tools/apiserver/tests/java/org/apache/heron/apiserver/utils/ConfigUtilsTests.java
index 2fbbc15..9d3b649 100644
--- a/heron/tools/apiserver/tests/java/org/apache/heron/apiserver/utils/ConfigUtilsTests.java
+++ b/heron/tools/apiserver/tests/java/org/apache/heron/apiserver/utils/ConfigUtilsTests.java
@@ -50,7 +50,7 @@ public class ConfigUtilsTests {
     final String overridesPath = ConfigUtils.createOverrideConfiguration(overrideProperties);
     try (Reader reader = Files.newBufferedReader(Paths.get(overridesPath))) {
       final Map<String, Object> overrides =
-          (Map<String, Object>) new Yaml(new SafeConstructor()).loadAs(reader, Map.class);
+          (Map<String, Object>) new Yaml(new SafeConstructor()).load(reader);
       assertEquals(overrides.size(), overrideProperties.size());
       for (String key : overrides.keySet()) {
         assertEquals(overrides.get(key), overrideProperties.getProperty(key));
@@ -82,7 +82,7 @@ public class ConfigUtilsTests {
 
     try (Reader reader = Files.newBufferedReader(stateManagerPath)) {
       final Map<String, Object> stateManagerWithOverrides =
-          (Map<String, Object>) new Yaml(new SafeConstructor()).loadAs(reader, Map.class);
+          (Map<String, Object>) new Yaml(new SafeConstructor()).load(reader);
       assertEquals(stateManagerWithOverrides.size(), 1);
       assertEquals(stateManagerWithOverrides.get("heron.statemgr.connection.string"),
           "zookeeper:2181");
@@ -112,7 +112,7 @@ public class ConfigUtilsTests {
 
     try (Reader reader = Files.newBufferedReader(stateManagerPath)) {
       final Map<String, Object> stateManagerWithOverrides =
-          (Map<String, Object>) new Yaml(new SafeConstructor()).loadAs(reader, Map.class);
+          (Map<String, Object>) new Yaml(new SafeConstructor()).load(reader);
       assertEquals(stateManagerWithOverrides.size(), 1);
       assertEquals(stateManagerWithOverrides.get("heron.statemgr.connection.string"),
           "<host>:<port>");
@@ -143,7 +143,7 @@ public class ConfigUtilsTests {
 
     try (Reader reader = Files.newBufferedReader(Paths.get(overridesPath))) {
       final Map<String, Object> newOverrides =
-          (Map<String, Object>) new Yaml(new SafeConstructor()).loadAs(reader, Map.class);
+          (Map<String, Object>) new Yaml(new SafeConstructor()).load(reader);
       assertEquals(newOverrides, combinedOverrides);
     }
   }
@@ -167,7 +167,7 @@ public class ConfigUtilsTests {
 
     try (Reader reader = Files.newBufferedReader(Paths.get(overridesPath))) {
       final Map<String, Object> newOverrides =
-          (Map<String, Object>) new Yaml(new SafeConstructor()).loadAs(reader, Map.class);
+          (Map<String, Object>) new Yaml(new SafeConstructor()).load(reader);
       assertEquals(newOverrides, overrides);
     }
   }