[ISSUE #6628] Remove redundant functional interfaces (#6653)

common/src/main/java/com/alibaba/nacos/common/http/AbstractHttpClientFactory.java

@@ -24,7 +24,7 @@ import com.alibaba.nacos.common.tls.SelfHostnameVerifier;
 import com.alibaba.nacos.common.tls.TlsFileWatcher;
 import com.alibaba.nacos.common.tls.TlsHelper;
 import com.alibaba.nacos.common.tls.TlsSystemConfig;
-import com.alibaba.nacos.common.utils.BiConsumer;
+import java.util.function.BiConsumer;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;

common/src/main/java/com/alibaba/nacos/common/notify/EventPublisherFactory.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.common.notify;
 
-import com.alibaba.nacos.common.utils.BiFunction;
+import java.util.function.BiFunction;
 
 /**
  * Event publisher factory.

common/src/main/java/com/alibaba/nacos/common/utils/BiConsumer.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.alibaba.nacos.common.utils;
-
-/**
- * Represents an operation that accepts two input arguments and returns no result.
- *
- * @author wangwei
- */
-public interface BiConsumer<T, U> {
-    
-    /**
-     * Performs this operation on the given arguments.
-     *
-     * @param t the first input argument
-     * @param u the second input argument
-     */
-    void accept(T t, U u);
-}

common/src/main/java/com/alibaba/nacos/common/utils/BiFunction.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.alibaba.nacos.common.utils;
-
-/**
- * Represents a function that accepts two arguments and produces a result. The following utility functions are extracted
- * from org.apache.commons.lang3.
- *
- * <p>This is a <a href="package-summary.html">functional interface</a>
- * whose functional method is {@link #apply(Object, Object)}.
- *
- * @author zongtanghu
- */
-public interface BiFunction<T, U, R> {
-    
-    /**
-     * Applies this function to the two given arguments.
-     *
-     * @param t the first function argument
-     * @param u the second function argument
-     * @return the function result
-     */
-    R apply(T t, U u);
-}

common/src/main/java/com/alibaba/nacos/common/utils/MapUtil.java

@@ -23,6 +23,7 @@ import java.util.Dictionary;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Predicate;
+import java.util.function.BiFunction;
 
 /**
  * Map utils.