You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/09 14:34:12 UTC

incubator-juneau git commit: Fix minor compilation warnings in testcases.

Repository: incubator-juneau
Updated Branches:
  refs/heads/master 3baf69464 -> ee9c26789


Fix minor compilation warnings in testcases.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/ee9c2678
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/ee9c2678
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/ee9c2678

Branch: refs/heads/master
Commit: ee9c26789fda2a238b13b635326583e86f453179
Parents: 3baf694
Author: James <ja...@salesforce.com>
Authored: Tue Aug 9 10:33:27 2016 -0400
Committer: James <ja...@salesforce.com>
Committed: Tue Aug 9 10:33:27 2016 -0400

----------------------------------------------------------------------
 .../src/test/java/org/apache/juneau/TestUtils.java              | 5 +----
 org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java     | 2 +-
 .../test/java/org/apache/juneau/utils/CT_StringVarResolver.java | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ee9c2678/org.apache.juneau/src/test/java/org/apache/juneau/TestUtils.java
----------------------------------------------------------------------
diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/TestUtils.java b/org.apache.juneau/src/test/java/org/apache/juneau/TestUtils.java
index 5820f29..deccd71 100755
--- a/org.apache.juneau/src/test/java/org/apache/juneau/TestUtils.java
+++ b/org.apache.juneau/src/test/java/org/apache/juneau/TestUtils.java
@@ -24,7 +24,6 @@ import java.util.regex.*;
 
 import javax.xml.*;
 import javax.xml.parsers.*;
-import javax.xml.transform.*;
 import javax.xml.transform.dom.*;
 import javax.xml.transform.stream.*;
 import javax.xml.validation.*;
@@ -247,9 +246,6 @@ public class TestUtils {
 		if (is == null) {
 			is = new FileInputStream(p);
 		}
-		if (is == null) {
-			throw new FileNotFoundException(p);
-		}
 		String e = IOUtils.read(is);
 		e = e.replaceAll("\r", "");
 		return e;
@@ -333,6 +329,7 @@ public class TestUtils {
 			return 0;
 		}
 
+		@Override
 		public String toString() {
 			return toString(0, new StringBuilder()).toString();
 		}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ee9c2678/org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java
----------------------------------------------------------------------
diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java b/org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java
index c20c778..0300f5f 100755
--- a/org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java
+++ b/org.apache.juneau/src/test/java/org/apache/juneau/a/A1.java
@@ -15,7 +15,7 @@ package org.apache.juneau.a;
 import org.apache.juneau.annotation.*;
 
 // Default class
-@SuppressWarnings({"unused","synthetic-access"})
+@SuppressWarnings({"unused","synthetic-access","javadoc"})
 @Bean(sort=true)
 public class A1 {
 	public int f1;

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ee9c2678/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_StringVarResolver.java
----------------------------------------------------------------------
diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_StringVarResolver.java b/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_StringVarResolver.java
index 4a26dae..b005d69 100755
--- a/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_StringVarResolver.java
+++ b/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_StringVarResolver.java
@@ -220,7 +220,7 @@ public class CT_StringVarResolver {
 		String in = null;
 
 		// Should reject names with characters outside A-Za-z
-		for (Class c : new Class[]{InvalidVar1.class, InvalidVar2.class, InvalidVar3.class, InvalidVar4.class, InvalidVar5.class}) {
+		for (Class<?> c : new Class[]{InvalidVar1.class, InvalidVar2.class, InvalidVar3.class, InvalidVar4.class, InvalidVar5.class}) {
 			try {
 				svr.addVars(c);
 				fail();