未验证 提交 2aab6118 编写于 作者: L Liang Zhang 提交者: GitHub

Move resource matadata to resource package (#8058)

* Fix javadoc

* Move resource mata data to resource package
上级 b6e7305e
......@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.route.engine.type.broadcast;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
......
......@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.route.engine.type.broadcast;
import com.google.common.collect.Lists;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.Before;
......
......@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.shardingsphere.infra.metadata.schema.model.datasource;
package org.apache.shardingsphere.infra.metadata.resource;
import lombok.Getter;
......
......@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.shardingsphere.infra.metadata.schema.model.datasource;
package org.apache.shardingsphere.infra.metadata.resource;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.metadata.MemorizedDataSourceMetaData;
......
......@@ -19,8 +19,6 @@ package org.apache.shardingsphere.infra.metadata.resource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import javax.sql.DataSource;
import java.sql.SQLException;
......@@ -42,6 +40,7 @@ public final class ShardingSphereResource {
/**
* Close data sources.
*
* @param dataSources data sources to be closed
* @throws SQLException exception
*/
......
......@@ -22,8 +22,8 @@ import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.metadata.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.junit.Test;
import javax.sql.DataSource;
......
......@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.shardingsphere.infra.metadata.schema.model.datasource;
package org.apache.shardingsphere.infra.metadata.resource;
import org.junit.Test;
import org.junit.runner.RunWith;
......
......@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.shardingsphere.infra.metadata.schema.model.datasource;
package org.apache.shardingsphere.infra.metadata.resource;
import org.apache.shardingsphere.infra.config.DatabaseAccessConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
......
......@@ -18,8 +18,6 @@
package org.apache.shardingsphere.infra.metadata.resource;
import org.apache.shardingsphere.infra.metadata.resource.fixture.CloseableDataSource;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
......
......@@ -34,8 +34,8 @@ import org.apache.shardingsphere.infra.rule.ShardingSphereRulesBuilder;
import org.apache.shardingsphere.infra.metadata.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.addressing.TableAddressingMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.addressing.TableAddressingMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.SchemaMetaDataLoader;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.schema.PhysicalSchemaMetaData;
......
......@@ -28,8 +28,8 @@ import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.metadata.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.addressing.TableAddressingMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.column.PhysicalColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.schema.PhysicalSchemaMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.table.PhysicalTableMetaData;
......
......@@ -18,7 +18,7 @@
package org.apache.shardingsphere.driver.jdbc.adapter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import java.sql.DatabaseMetaData;
import java.sql.RowIdLifetime;
......
......@@ -24,7 +24,7 @@ import org.apache.shardingsphere.driver.jdbc.core.resultset.DatabaseMetaDataResu
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.rule.DataNodeRoutedRule;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import java.security.SecureRandom;
import java.sql.Connection;
......
......@@ -22,7 +22,7 @@ import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne
import org.apache.shardingsphere.driver.jdbc.core.resultset.DatabaseMetaDataResultSet;
import org.apache.shardingsphere.infra.context.schema.SchemaContexts;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
......
......@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.binder.segment.select.projection.impl.Exp
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.executor.sql.raw.execute.result.query.QueryHeader;
import org.apache.shardingsphere.infra.metadata.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.column.PhysicalColumnMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.index.PhysicalIndexMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.schema.physical.model.schema.PhysicalSchemaMetaData;
......
......@@ -10,8 +10,8 @@ import org.apache.shardingsphere.infra.metadata.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.schema.model.datasource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.CachedDatabaseMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.junit.Before;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册