From bc07e255da49dc13e0468c12eea351832fb6f99d Mon Sep 17 00:00:00 2001 From: calvin1978 Date: Sat, 21 Jan 2017 00:59:20 +0800 Subject: [PATCH] =?UTF-8?q?#525=20=E4=BF=AE=E6=AD=A3JSR166e=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E7=B1=BB=E7=94=A8=E4=BA=86JDK7=E6=89=8D=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/utils/concurrent/jsr166e/CountedCompleter.java | 1 - .../modules/utils/concurrent/jsr166e/ThreadLocalRandom.java | 1 - .../java/org/springside/modules/utils/io/ResourceUtilTest.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/CountedCompleter.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/CountedCompleter.java index f816eb89..efa02bf8 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/CountedCompleter.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/CountedCompleter.java @@ -6,7 +6,6 @@ package org.springside.modules.utils.concurrent.jsr166e; -import java.util.concurrent.RecursiveAction; /** * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/jsr166e/CountedCompleter.java 1.31 diff --git a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/ThreadLocalRandom.java b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/ThreadLocalRandom.java index ef090a4e..455cb27a 100644 --- a/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/ThreadLocalRandom.java +++ b/modules/utils/src/main/java/org/springside/modules/utils/concurrent/jsr166e/ThreadLocalRandom.java @@ -7,7 +7,6 @@ package org.springside.modules.utils.concurrent.jsr166e; import java.util.Random; -import java.util.concurrent.ForkJoinTask; /** * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/src/jsr166e/ThreadLocalRandom.java 1.2 diff --git a/modules/utils/src/test/java/org/springside/modules/utils/io/ResourceUtilTest.java b/modules/utils/src/test/java/org/springside/modules/utils/io/ResourceUtilTest.java index b2b8cdfb..5c349ade 100644 --- a/modules/utils/src/test/java/org/springside/modules/utils/io/ResourceUtilTest.java +++ b/modules/utils/src/test/java/org/springside/modules/utils/io/ResourceUtilTest.java @@ -14,7 +14,7 @@ public class ResourceUtilTest { @Test public void test() throws IOException { // getResoruce - assertThat(ResourceUtil.toString("/test.txt")).contains("ABCDEFG"); + assertThat(ResourceUtil.toString("test.txt")).contains("ABCDEFG"); assertThat(ResourceUtil.toString(ResourceUtilTest.class, "/test.txt")).contains("ABCDEFG"); assertThat(ResourceUtil.toLines("test.txt")).containsExactly("ABCDEFG", "ABC"); assertThat(ResourceUtil.toLines(ResourceUtilTest.class, "/test.txt")).containsExactly("ABCDEFG", "ABC");