1 files changed, 32 insertions, 30 deletions

diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java
index bf44a8026..ced419a04 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/Util.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * util
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,44 +24,46 @@ import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
+import org.onap.policy.controlloop.policy.ControlLoopPolicy;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-import org.onap.policy.controlloop.policy.ControlLoopPolicy;
-
 public final class Util {
 
-	public static class Pair<A, B> {
-		public final A a;
-		public final B b;
-		
-		public Pair(A a, B b) {
-			this.a = a;
-			this.b = b;
-		}
-	}
-	
-	public static Pair<ControlLoopPolicy, String>	loadYaml(String testFile) {
-		try (InputStream is = new FileInputStream(new File(testFile))) {
-			String contents = IOUtils.toString(is, StandardCharsets.UTF_8);
-			//
-			// Read the yaml into our Java Object
-			//
-			Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
-			Object obj = yaml.load(contents);
-			return new Pair<ControlLoopPolicy, String>((ControlLoopPolicy) obj, contents);
-		} catch (FileNotFoundException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-		return null;
-	}
+    public static class Pair<A, B> {
+        public final A key;
+        public final B value;
+
+        public Pair(A key, B value) {
+            this.key = key;
+            this.value = value;
+        }
+    }
+
+    /**
+     * Load yaml into a Pair object.
+     * 
+     * @param testFile the yaml file
+     * @return a Pair
+     */
+    public static Pair<ControlLoopPolicy, String> loadYaml(String testFile) {
+        try (InputStream is = new FileInputStream(new File(testFile))) {
+            String contents = IOUtils.toString(is, StandardCharsets.UTF_8);
+            //
+            // Read the yaml into our Java Object
+            //
+            Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
+            Object obj = yaml.load(contents);
+            return new Pair<ControlLoopPolicy, String>((ControlLoopPolicy) obj, contents);
+        } catch (IOException e) {
+            fail(e.getLocalizedMessage());
+        }
+        return null;
+    }
 
 }