diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java index efeea1f70bda07022d0bc052e0b052c6e3d819d3..ad87b8cbeaf4bbdc48cf5f12d40f3c4a86c3b389 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java @@ -68,7 +68,7 @@ import java.util.stream.Collectors; /** * Governance schema contexts. */ -public abstract class GovernanceSchemaContexts implements SchemaContexts { +public class GovernanceSchemaContexts implements SchemaContexts { private final GovernanceFacade governanceFacade; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java index 8bd22e677d21b2f742a200fe1414dd926a62ca3c..12d01cae13d420b5de67e14a4d884603015eaf60 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java @@ -32,7 +32,6 @@ import org.apache.shardingsphere.governance.core.registry.RegistryCenter; import org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent; import org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent; import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema; -import org.apache.shardingsphere.governance.core.schema.fixture.GovernanceSchemaContextsFixture; import org.apache.shardingsphere.infra.auth.Authentication; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties; @@ -93,14 +92,14 @@ public final class GovernanceSchemaContextsTest { private ConfigurationProperties configurationProperties = new ConfigurationProperties(new Properties()); - private GovernanceSchemaContextsFixture governanceSchemaContexts; + private GovernanceSchemaContexts governanceSchemaContexts; @Before public void setUp() { when(governanceFacade.getRegistryCenter()).thenReturn(registryCenter); when(registryCenter.loadDisabledDataSources("schema")).thenReturn(Collections.singletonList("schema.ds_1")); when(governanceFacade.getMetaDataCenter()).thenReturn(metaDataCenter); - governanceSchemaContexts = new GovernanceSchemaContextsFixture( + governanceSchemaContexts = new GovernanceSchemaContexts( new StandardSchemaContexts(getSchemaContextMap(), authentication, configurationProperties, new H2DatabaseType()), governanceFacade); } diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java deleted file mode 100644 index b3f9722f3af43247f64ed7ae4c18ebd9dd186c65..0000000000000000000000000000000000000000 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/fixture/GovernanceSchemaContextsFixture.java +++ /dev/null @@ -1,30 +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.governance.core.schema.fixture; - -import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; -import org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts; -import org.apache.shardingsphere.infra.context.SchemaContexts; - -public final class GovernanceSchemaContextsFixture extends GovernanceSchemaContexts { - - public GovernanceSchemaContextsFixture(final SchemaContexts schemaContexts, final GovernanceFacade governanceFacade) { - super(schemaContexts, governanceFacade); - } - -}