You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/02/07 18:35:17 UTC
[jackrabbit-oak] branch OAK-10109 created (now 8358f68d52)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10109
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 8358f68d52 OAK-10109: deprecate TransformingComparator(Comparator, com.google.common.base.Function)
This branch includes the following new commits:
new 8358f68d52 OAK-10109: deprecate TransformingComparator(Comparator, com.google.common.base.Function)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-10109: deprecate TransformingComparator(Comparator, com.google.common.base.Function)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10109
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 8358f68d52837e348296cc9a2b813487dbd93b12
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Feb 7 19:34:58 2023 +0100
OAK-10109: deprecate TransformingComparator(Comparator, com.google.common.base.Function)
---
.../apache/jackrabbit/oak/commons/FileIOUtils.java | 26 ++++++++++++++++++----
.../jackrabbit/oak/commons/package-info.java | 2 +-
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
index 0c7402a4de..73eb111192 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
@@ -320,7 +320,7 @@ public final class FileIOUtils {
* @return comparator aware of line breaks
*/
public static Comparator<String> lineBreakAwareComparator (Comparator<String> delegate) {
- return new FileIOUtils.TransformingComparator(delegate, new Function<String, String>() {
+ return new FileIOUtils.TransformingComparator(delegate, new java.util.function.Function<String, String>() {
@Nullable
@Override
public String apply(@Nullable String input) {
@@ -354,10 +354,28 @@ public final class FileIOUtils {
* comparator.
*/
public static class TransformingComparator implements Comparator<String> {
- private Comparator delegate;
- private Function<String, String> func;
+ private Comparator<String> delegate;
+ private java.util.function.Function<String, String> func;
+
+ /**
+ * @deprecated use {@link TransformingComparator(Comparator<String>
+ * delegate, java.util.function.Function<String, String>)
+ * instead
+ */
+ @Deprecated(since = "1.50.0", forRemoval = true)
+ public TransformingComparator(Comparator<String> delegate, final Function<String, String> func) {
+ GuavaDeprecation.handleCall("OAK-10109");
+ this.delegate = delegate;
+ this.func = new java.util.function.Function<String, String>() {
+ @Override
+ public String apply(String t) {
+ return func.apply(t);
+ }
+ };
+ }
- public TransformingComparator(Comparator delegate, Function<String, String> func) {
+ public TransformingComparator(Comparator<String> delegate, java.util.function.Function<String, String> func) {
+ GuavaDeprecation.handleCall("OAK-10109");
this.delegate = delegate;
this.func = func;
}
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
index 6c95db47cb..df492d9729 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.7.0")
+@Version("1.8.0")
package org.apache.jackrabbit.oak.commons;
import org.osgi.annotation.versioning.Version;