This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1c5303ab2f8 Remove FunctionWithException. (#24430)
1c5303ab2f8 is described below
commit 1c5303ab2f881e71345d06f7a3c51c4d3816807c
Author: Raigor <raigor.ji...@gmail.com>
AuthorDate: Fri Mar 3 07:27:26 2023 +0800
Remove FunctionWithException. (#24430)
---
.../handler/admin/FunctionWithException.java | 33 ----------------------
.../executor/AbstractDatabaseMetaDataExecutor.java | 12 ++++----
2 files changed, 7 insertions(+), 38 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/FunctionWithException.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/FunctionWithException.java
deleted file mode 100644
index 18df58db5d6..00000000000
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/FunctionWithException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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 org.apache.shardingsphere.proxy.backend.handler.admin;
-
-/**
- * FunctionWithException interface.
- */
-@FunctionalInterface
-public interface FunctionWithException<T, E extends Exception> {
-
- /**
- * Apply function.
- *
- * @param t param
- * @throws E exception
- */
- void apply(T t) throws E;
-}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
index ab2603a978a..465017cd799 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/AbstractDatabaseMetaDataExecutor.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.handler.admin.executor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.authority.checker.AuthorityChecker;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
@@ -33,7 +34,6 @@ import
org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphere
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.StorageUnitNotExistedException;
-import
org.apache.shardingsphere.proxy.backend.handler.admin.FunctionWithException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import javax.sql.DataSource;
@@ -52,6 +52,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
@@ -80,7 +81,8 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
mergedResult = createMergedResult();
}
- private void handleResultSet(final String databaseName, final ResultSet
resultSet) throws SQLException {
+ @SneakyThrows(SQLException.class)
+ private void handleResultSet(final String databaseName, final ResultSet
resultSet) {
ResultSetMetaData metaData = resultSet.getMetaData();
while (resultSet.next()) {
Map<String, Object> rowMap = new LinkedHashMap<>();
@@ -107,7 +109,7 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
protected abstract void createPreProcessing();
- protected abstract void getSourceData(String databaseName,
FunctionWithException<ResultSet, SQLException> callback) throws SQLException;
+ protected abstract void getSourceData(String databaseName,
Consumer<ResultSet> callback) throws SQLException;
protected abstract void rowPostProcessing(String databaseName, Map<String,
Object> rowMap, Map<String, String> aliasMap);
@@ -156,7 +158,7 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
}
@Override
- protected void getSourceData(final String databaseName, final
FunctionWithException<ResultSet, SQLException> callback) throws SQLException {
+ protected void getSourceData(final String databaseName, final
Consumer<ResultSet> callback) throws SQLException {
ShardingSphereResourceMetaData resourceMetaData =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData();
Optional<Entry<String, DataSource>> dataSourceEntry =
resourceMetaData.getDataSources().entrySet().stream().findFirst();
log.info("Actual SQL: {} ::: {}", dataSourceEntry.orElseThrow(()
-> new StorageUnitNotExistedException(databaseName)).getKey(), sql);
@@ -164,7 +166,7 @@ public abstract class AbstractDatabaseMetaDataExecutor
implements DatabaseAdminQ
Connection connection =
dataSourceEntry.get().getValue().getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(sql);
ResultSet resultSet = preparedStatement.executeQuery()) {
- callback.apply(resultSet);
+ callback.accept(resultSet);
}
}
