From bb58bd9abddcf6f8879bc4cdd25bdd8af12e56ea Mon Sep 17 00:00:00 2001 From: zhaojinchao Date: Wed, 25 Oct 2023 23:34:15 +0800 Subject: [PATCH] Refactor example --- ...amlExampleConfigurationSupportedValue.java | 4 +-- .../resources/yaml/feature/db-discovery.ftl | 34 ------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/feature/db-discovery.ftl diff --git a/examples/shardingsphere-jdbc-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/yaml/config/YamlExampleConfigurationSupportedValue.java b/examples/shardingsphere-jdbc-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/yaml/config/YamlExampleConfigurationSupportedValue.java index 5194d851df7d2..3ecc90fa97b1b 100644 --- a/examples/shardingsphere-jdbc-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/yaml/config/YamlExampleConfigurationSupportedValue.java +++ b/examples/shardingsphere-jdbc-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/yaml/config/YamlExampleConfigurationSupportedValue.java @@ -31,11 +31,11 @@ @Getter public enum YamlExampleConfigurationSupportedValue { - MODES("modes", new HashSet<>(Arrays.asList("memory", "proxy", "cluster-zookeeper", "cluster-etcd", "standalone"))), + MODES("modes", new HashSet<>(Arrays.asList("proxy", "cluster-zookeeper", "cluster-etcd", "standalone"))), TRANSACTIONS("transactions", new HashSet<>(Arrays.asList("local", "xa-atomikos", "xa-narayana", "base-seata"))), - FEATURES("features", new HashSet<>(Arrays.asList("shadow", "sharding", "readwrite-splitting", "encrypt", "db-discovery", "mask"))), + FEATURES("features", new HashSet<>(Arrays.asList("shadow", "sharding", "readwrite-splitting", "encrypt", "mask"))), FRAMEWORKS("frameworks", new HashSet<>(Arrays.asList("jdbc", "spring-boot-starter-jdbc", "spring-boot-starter-jpa", "spring-boot-starter-mybatis", "spring-namespace-jdbc", "spring-namespace-jpa", "spring-namespace-mybatis"))); diff --git a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/feature/db-discovery.ftl b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/feature/db-discovery.ftl deleted file mode 100644 index d653faaec61a4..0000000000000 --- a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/yaml/feature/db-discovery.ftl +++ /dev/null @@ -1,34 +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. - --> -- !DB_DISCOVERY - dataSources: - group_0: - dataSourceNames: - - ds_0 - - ds_1 - - ds_2 - discoveryHeartbeatName: mgr_heartbeat - discoveryTypeName: mgr_type - discoveryHeartbeats: - mgr_heartbeat: - props: - keep-alive-cron: '0/5 * * * * ?' - discoveryTypes: - mgr_type: - type: MySQL.MGR - props: - group-name: aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa