From 777165ac3ef4b03525d16ff82a723a0ee42f7811 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 19 Dec 2019 14:43:28 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1328=20fine-poi=E6=94=AF=E6=8C=81JDK11?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E7=9A=84=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=80=E5=B9=B6=E4=BF=AE=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/apache/commons/pool2/impl/package.html | 16 ++++++++-------- .../third/org/apache/commons/pool2/overview.html | 12 ++++++------ .../apache/poi/hssf/usermodel/HSSFWorkbook.java | 2 +- .../fr/third/v2/org/apache/poi/util/HexDump.java | 2 +- .../third/v2/org/apache/poi/util/OOXMLLite.java | 3 ++- .../poi/xssf/extractor/XSSFImportFromXML.java | 2 +- .../aop/target/CommonsPoolTargetSource.java | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html index 7a0cbb316..c53174751 100755 --- a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html +++ b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/impl/package.html @@ -17,26 +17,26 @@ - Package Documentation for org.apache.commons.pool2.impl + Package Documentation for com.fr.third.org.apache.commons.pool2.impl

Object pooling API implementations.

- {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool} - ({@link org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool}) + {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool} + ({@link com.fr.third.org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool}) provides a more robust (but also more complicated) - implementation of {@link org.apache.commons.pool2.ObjectPool ObjectPool} - ({@link org.apache.commons.pool2.KeyedObjectPool KeyedObjectPool}). + implementation of {@link com.fr.third.org.apache.commons.pool2.ObjectPool ObjectPool} + ({@link com.fr.third.org.apache.commons.pool2.KeyedObjectPool KeyedObjectPool}).

- {@link org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool} + {@link com.fr.third.org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool} provides a {@link java.lang.ref.SoftReference SoftReference} based - {@link org.apache.commons.pool2.ObjectPool ObjectPool}. + {@link com.fr.third.org.apache.commons.pool2.ObjectPool ObjectPool}.

- See also the {@link org.apache.commons.pool2} package. + See also the {@link com.fr.third.org.apache.commons.pool2} package.

diff --git a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html index d79a61048..b1e83736c 100755 --- a/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html +++ b/fine-jedis/src/com/fr/third/org/apache/commons/pool2/overview.html @@ -17,14 +17,14 @@ - Overview of the org.apache.commons.pool2 component + Overview of the com.fr.third.org.apache.commons.pool2 component

Generic Object pooling API with several implementations.

- The org.apache.commons.pool2 package defines a simple + The com.fr.third.org.apache.commons.pool2 package defines a simple interface for a pool of object instances, and a handful of base classes that may be useful when creating pool implementations. The API supports pooling of unique objects which can be requested @@ -33,17 +33,17 @@

The org.apache.commons.pool2.impl package contains several pool implementations. - {@link org.apache.commons.pool2.impl.GenericObjectPool + {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool} has many configuration options and can support a limited set of objects such as would be useful in a database connection pool. - {@link org.apache.commons.pool2.impl.SoftReferenceObjectPool + {@link com.fr.third.org.apache.commons.pool2.impl.SoftReferenceObjectPool SoftReferenceObjectPool} has no limit on the number of objects in the pool, but the garbage collector can remove idle objects from the pool as needed. There is also a keyed version of - {@link org.apache.commons.pool2.impl.GenericObjectPool + {@link com.fr.third.org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool}, - {@link org.apache.commons.pool2.impl.GenericKeyedObjectPool + {@link com.fr.third.org.apache.commons.pool2.impl.GenericKeyedObjectPool GenericKeyedObjectPool}

diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 5ba2239cb..9d0a5308e 100644 --- a/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.regex.Pattern; -import org.apache.commons.codec.digest.DigestUtils; +import com.fr.third.org.apache.commons.codec.digest.DigestUtils; import com.fr.third.v2.org.apache.poi.EncryptedDocumentException; import com.fr.third.v2.org.apache.poi.POIDocument; import com.fr.third.v2.org.apache.poi.ddf.EscherBSERecord; diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java index 189308bc9..431ed74db 100644 --- a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java +++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/HexDump.java @@ -29,7 +29,7 @@ import java.io.PrintStream; import java.nio.charset.Charset; import java.util.Locale; -import org.apache.commons.codec.CharEncoding; +import com.fr.third.org.apache.commons.codec.CharEncoding; /** * dump data in hexadecimal format diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java index ffa291e08..cc15d8c2e 100644 --- a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java +++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/OOXMLLite.java @@ -43,7 +43,8 @@ import junit.framework.TestCase; import org.junit.Test; import org.junit.internal.TextListener; -import org.junit.runner.JUnitCore;import org.junit.runner.Result; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; /** * Build a 'lite' version of the ooxml-schemas.jar diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java index 93bd0ca15..da9a6d596 100644 --- a/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java +++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/xssf/extractor/XSSFImportFromXML.java @@ -293,7 +293,7 @@ public class XSSFImportFromXML { // Dummy implementation - not used! @Override - public Iterator getPrefixes(String val) { + public Iterator getPrefixes(String val) { return null; } diff --git a/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java b/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java index 574aacda7..9994a413a 100644 --- a/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java +++ b/fine-spring/src/com/fr/third/springframework/aop/target/CommonsPoolTargetSource.java @@ -16,9 +16,9 @@ package com.fr.third.springframework.aop.target; -import org.apache.commons.pool.ObjectPool; -import org.apache.commons.pool.PoolableObjectFactory; -import org.apache.commons.pool.impl.GenericObjectPool; +import com.fr.third.org.apache.commons.pool.ObjectPool; +import com.fr.third.org.apache.commons.pool.PoolableObjectFactory; +import com.fr.third.org.apache.commons.pool.impl.GenericObjectPool; import com.fr.third.springframework.beans.BeansException; import com.fr.third.springframework.core.Constants;