diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java b/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java index b0afa2c5b8a..f9f78661210 100644 --- a/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java +++ b/alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java @@ -17,11 +17,14 @@ package org.apache.hertzbeat.alert.config; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; /** * Alert auto configuration. */ + +@AutoConfiguration @ComponentScan(basePackages = "org.apache.hertzbeat.alert") public class AlerterAutoConfiguration { } diff --git a/alerter/src/main/resources/META-INF/spring.factories b/alerter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 13843a7949e..00000000000 --- a/alerter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,17 +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. - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.hertzbeat.alert.config.AlerterAutoConfiguration diff --git a/alerter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/alerter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0becd31fa85..bbff659d5c8 100644 --- a/alerter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/alerter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.hertzbeat.alert.config.AlerterAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.alert.config.AlerterAutoConfiguration diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java index 193dd1a38b2..7264c8c9b57 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java @@ -549,7 +549,7 @@ public HttpUriRequest createHttpRequest(HttpProtocol httpProtocol) { } // if it has payload, would override post params - if (StringUtils.hasLength(httpProtocol.getPayload())) { + if (StringUtils.hasLength(httpProtocol.getPayload()) && (HttpMethod.POST.matches(httpMethod) || HttpMethod.PUT.matches(httpMethod))) { requestBuilder.setEntity(new StringEntity(httpProtocol.getPayload(), StandardCharsets.UTF_8)); } diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java b/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java index e4bfd909556..a94d74488ba 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/config/CollectorAutoConfiguration.java @@ -17,12 +17,15 @@ package org.apache.hertzbeat.collector.config; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; /** * Collector Auto Configuration * @version 2.1 */ + +@AutoConfiguration @ComponentScan(basePackages = "org.apache.hertzbeat.collector") public class CollectorAutoConfiguration { } diff --git a/collector/src/main/resources/META-INF/spring.factories b/collector/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 771bb51c6bc..00000000000 --- a/collector/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,17 +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. - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.hertzbeat.collector.config.CollectorAutoConfiguration diff --git a/collector/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/collector/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 85622a853b4..88a05890b6f 100644 --- a/collector/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/collector/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.hertzbeat.collector.config.CollectorAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.collector.config.CollectorAutoConfiguration diff --git a/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java b/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java index 7dfaf4ab597..fa51f981e45 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java +++ b/common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java @@ -18,16 +18,17 @@ package org.apache.hertzbeat.common.config; import org.apache.hertzbeat.common.util.AesUtil; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; /** * common module config */ + +@AutoConfiguration @ComponentScan(basePackages = "org.apache.hertzbeat.common") @EnableConfigurationProperties(CommonProperties.class) -@Configuration public class CommonConfig { public CommonConfig(CommonProperties commonProperties) { diff --git a/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java index 13448e2868a..a3065fb661c 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java +++ b/common/src/main/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8Control.java @@ -20,21 +20,18 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.util.Locale; import java.util.PropertyResourceBundle; import java.util.ResourceBundle; -import lombok.extern.slf4j.Slf4j; /** * i18n resource bundle control */ -@Slf4j + public class ResourceBundleUtf8Control extends ResourceBundle.Control { private static final String JAVA_CLASS = "java.class"; @@ -44,6 +41,7 @@ public class ResourceBundleUtf8Control extends ResourceBundle.Control { @Override public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException { + String bundleName = toBundleName(baseName, locale); ResourceBundle bundle = null; if (JAVA_CLASS.equals(format)) { @@ -55,48 +53,25 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C // If the class isn't a ResourceBundle subclass, throw a // ClassCastException. if (ResourceBundle.class.isAssignableFrom(bundleClass)) { - bundle = bundleClass.newInstance(); + bundle = bundleClass.getDeclaredConstructor().newInstance(); } else { throw new ClassCastException(bundleClass.getName() + " cannot be cast to ResourceBundle"); } } catch (ClassNotFoundException ignored) {} - } else if (JAVA_PROPERTIES.equals(format)) { - final String resourceName = toResourceName0(bundleName, "properties"); + catch (InvocationTargetException | NoSuchMethodException e) { + throw new RuntimeException(e); + } + } else if (JAVA_PROPERTIES.equals(format)) { + final String resourceName = toResourceName0(bundleName); if (resourceName == null) { return null; } - final ClassLoader classLoader = loader; - final boolean reloadFlag = reload; - InputStream stream; - try { - stream = AccessController.doPrivileged( - (PrivilegedExceptionAction) () -> { - InputStream is = null; - if (reloadFlag) { - URL url = classLoader.getResource(resourceName); - if (url != null) { - URLConnection connection = url.openConnection(); - if (connection != null) { - // Disable caches to get fresh data for - // reloading. - connection.setUseCaches(false); - is = connection.getInputStream(); - } - } - } else { - is = classLoader.getResourceAsStream(resourceName); - } - return is; - }); - } catch (PrivilegedActionException e) { - throw (IOException) e.getException(); - } + InputStream stream = getResourceInputStream(loader, resourceName, reload); + if (stream != null) { - try { + try (stream) { bundle = new PropertyResourceBundle(new InputStreamReader(stream, StandardCharsets.UTF_8)); - } finally { - stream.close(); } } } else { @@ -105,12 +80,34 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C return bundle; } - private String toResourceName0(String bundleName, String suffix) { + private String toResourceName0(String bundleName) { // application protocol check if (bundleName.contains(SPILT)) { return null; } else { - return toResourceName(bundleName, suffix); + return toResourceName(bundleName, "properties"); + } + } + + private InputStream getResourceInputStream(ClassLoader classLoader, String resourceName, boolean reloadFlag) throws IOException { + + InputStream is = null; + + if (reloadFlag) { + URL url = classLoader.getResource(resourceName); + if (url != null) { + URLConnection connection = url.openConnection(); + if (connection != null) { + // Disable caches to get fresh data for reloading. + connection.setUseCaches(false); + is = connection.getInputStream(); + } + } + } else { + is = classLoader.getResourceAsStream(resourceName); } + + return is; } + } diff --git a/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java b/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java index 086b84a9e6c..43d4ecb2356 100644 --- a/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java +++ b/common/src/test/java/org/apache/hertzbeat/common/support/ResourceBundleUtf8ControlTest.java @@ -17,14 +17,59 @@ package org.apache.hertzbeat.common.support; +import java.io.IOException; +import java.util.Locale; +import java.util.ResourceBundle; + import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + /** * Test case for {@link ResourceBundleUtf8Control} */ class ResourceBundleUtf8ControlTest { - @Test - void newBundle() { - } -} \ No newline at end of file + @Test + void testNewBundleWithPropertiesFormat() throws IllegalAccessException, InstantiationException, IOException { + + ResourceBundle.Control control = new ResourceBundleUtf8Control(); + ClassLoader loader = getClass().getClassLoader(); + String baseName = "msg"; + + ResourceBundle bundle = control.newBundle(baseName, Locale.ENGLISH, "java.properties", loader, false); + assertNotNull(bundle); + assertEquals("Hello, World!", bundle.getString("hello")); + + bundle = control.newBundle(baseName, Locale.ROOT, "java.properties", loader, false); + assertNotNull(bundle); + assertEquals("你好", bundle.getString("hello")); + } + + @Test + void testNewBundleWithClassFormat() throws IllegalAccessException, InstantiationException, IOException { + + ResourceBundle.Control control = new ResourceBundleUtf8Control(); + ClassLoader loader = getClass().getClassLoader(); + String baseName = "dummyClassBundle"; + + ResourceBundle bundle = control.newBundle(baseName, Locale.ENGLISH, "java.class", loader, false); + //because not have an actual class, bundle should be null + assertNull(bundle); + } + + @Test + void testReloading() throws IllegalAccessException, InstantiationException, IOException { + ResourceBundle.Control control = new ResourceBundleUtf8Control(); + ClassLoader loader = getClass().getClassLoader(); + String baseName = "msg"; + + // Test with reload flag + ResourceBundle bundle = control.newBundle(baseName, Locale.ENGLISH, "java.properties", loader, true); + assertNotNull(bundle); + assertEquals("Hello, World!", bundle.getString("hello")); + } + +} diff --git a/common/src/main/resources/META-INF/spring.factories b/common/src/test/resources/msg.properties similarity index 87% rename from common/src/main/resources/META-INF/spring.factories rename to common/src/test/resources/msg.properties index 9027bee7cb0..6dc68e451d6 100644 --- a/common/src/main/resources/META-INF/spring.factories +++ b/common/src/test/resources/msg.properties @@ -13,6 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.hertzbeat.common.config.CommonConfig +hello=你好 diff --git a/push/src/main/resources/META-INF/spring.factories b/common/src/test/resources/msg_en.properties similarity index 86% rename from push/src/main/resources/META-INF/spring.factories rename to common/src/test/resources/msg_en.properties index a433ed2b39b..7514bf5db7d 100644 --- a/push/src/main/resources/META-INF/spring.factories +++ b/common/src/test/resources/msg_en.properties @@ -13,5 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.hertzbeat.push.config.PushAutoConfiguration +hello=Hello, World! diff --git a/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java b/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java index d087c5adc98..372897d594e 100644 --- a/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java +++ b/push/src/main/java/org/apache/hertzbeat/push/config/PushAutoConfiguration.java @@ -17,11 +17,14 @@ package org.apache.hertzbeat.push.config; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; /** * push configuration */ + +@AutoConfiguration @ComponentScan(basePackages = "org.apache.hertzbeat.push") public class PushAutoConfiguration { } diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseAutoConfiguration.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java similarity index 88% rename from warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseAutoConfiguration.java rename to warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java index 498e487e1b2..72a8a1d515e 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/WarehouseAutoConfiguration.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseAutoConfiguration.java @@ -15,14 +15,17 @@ * limitations under the License. */ -package org.apache.hertzbeat.warehouse; +package org.apache.hertzbeat.warehouse.config; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.ComponentScan; /** * WarehouseAutoConfiguration class * @version 2.1 */ + +@AutoConfiguration @ComponentScan(basePackages = "org.apache.hertzbeat.warehouse") public class WarehouseAutoConfiguration { } diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java index ba7501071c7..4ce7887f88c 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java @@ -31,7 +31,7 @@ @Component public class WareHouseApplicationReadyListener { - private Optional historyDataStorage; + private final Optional historyDataStorage; public WareHouseApplicationReadyListener(Optional historyDataStorage) { this.historyDataStorage = historyDataStorage; diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java index 6b4ed8b7083..f9f6b69213e 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java @@ -78,9 +78,8 @@ protected void startPersistentDataStorage() { if (metricsData == null) { continue; } - if (historyDataWriter.isPresent()) { - historyDataWriter.get().saveData(metricsData); - } + + historyDataWriter.ifPresent(dataWriter -> dataWriter.saveData(metricsData)); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java index 777a0a7d30c..9626ba16fd9 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/iotdb/IotDbDataStorage.java @@ -55,7 +55,7 @@ public class IotDbDataStorage extends AbstractHistoryDataStorage { private static final String NEVER_EXPIRE = "-1"; /** - * storage group (存储组) + * storage group */ private static final String STORAGE_GROUP = "root.hertzbeat"; @@ -379,9 +379,9 @@ private void handleHistoryIntervalSelect(String selectSql, String instance, } /** - * 获取deviceId下的所有设备 + * Query all devices by deviceId * - * @param deviceId 设备/实体 + * @param deviceId deviceId */ private List queryAllDevices(String deviceId) { String showDevicesSql = String.format(SHOW_DEVICES, deviceId + ".*"); @@ -406,10 +406,10 @@ private List queryAllDevices(String deviceId) { } /** - * gets the device ID - * 有instanceId的使用 ${group}.${app}.${metrics}.${monitor}.${labels} 的方式 - * 否则使用 ${group}.${app}.${metrics}.${monitor} 的方式 - * 查询时可以通过 ${group}.${app}.${metrics}.${monitor}.* 的方式获取所有instance数据 + * use ${group}.${app}.${metrics}.${monitor}.${labels} to get device id if there is a way to get instanceId + * otherwise use ${group}.${app}.${metrics}.${monitor} + * + * Use ${group}.${app}.${metrics}.${monitor}.* to get all instance data when you tend to query */ private String getDeviceId(String app, String metrics, Long monitorId, String labels, boolean useQuote) { String deviceId = STORAGE_GROUP + "." diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tdengine/TdEngineDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tdengine/TdEngineDataStorage.java index 7f9c896a2bd..ead5737f019 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tdengine/TdEngineDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tdengine/TdEngineDataStorage.java @@ -100,9 +100,9 @@ public TdEngineDataStorage(TdEngineProperties tdEngineProperties) { } /** - * {@code TdEngine} 初始化数据库 + * {@code TdEngine} init TdEngineDatabase * - * @param tdEngineProperties {@link TdEngineProperties} 对象实例 + * @param tdEngineProperties {@link TdEngineProperties} */ private void initTdEngineDatabase(final TdEngineProperties tdEngineProperties) throws SQLException { final Properties parseResultProperties = com.taosdata.jdbc.utils.StringUtils.parseUrl(tdEngineProperties.url(), null); @@ -376,7 +376,7 @@ public Map> getHistoryIntervalMetricData(Long monitorId, Str instances.add(label); } if (instances.isEmpty()) { - // 若未指定instance，需查询当前指标数据前1周有多少个instance + // need to confirm that how many instances of current metrics one week ago String queryInstanceSql = String.format(QUERY_INSTANCE_SQL, table); Connection connection = null; try { diff --git a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java index b9a08953dd7..12ce78738b9 100644 --- a/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java +++ b/warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/realtime/redis/RedisDataStorage.java @@ -99,13 +99,12 @@ private boolean initRedisClient(RedisProperties redisProperties) { log.error("init error, please config Warehouse redis props in application.yml"); return false; } - RedisProperties redisProp = redisProperties; RedisURI.Builder uriBuilder = RedisURI.builder() - .withHost(redisProp.host()) - .withPort(redisProp.port()) + .withHost(redisProperties.host()) + .withPort(redisProperties.port()) .withTimeout(Duration.of(10, ChronoUnit.SECONDS)); - if (redisProp.password() != null && !"".equals(redisProp.password())) { - uriBuilder.withPassword(redisProp.password().toCharArray()); + if (redisProperties.password() != null && !"".equals(redisProperties.password())) { + uriBuilder.withPassword(redisProperties.password().toCharArray()); } try { redisClient = RedisClient.create(uriBuilder.build()); diff --git a/warehouse/src/main/resources/META-INF/spring.factories b/warehouse/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2df923ea4c1..00000000000 --- a/warehouse/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,17 +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. - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.apache.hertzbeat.warehouse.WarehouseAutoConfiguration diff --git a/warehouse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/warehouse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 97c492ff37f..e9d621619dd 100644 --- a/warehouse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/warehouse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.hertzbeat.warehouse.WarehouseAutoConfiguration \ No newline at end of file +org.apache.hertzbeat.warehouse.config.WarehouseAutoConfiguration