enumType, T defaultValue);
-
- /**
- * Return the duration property value(in milliseconds) with the given name, or {@code
- * defaultValue} if the name doesn't exist. Please note the format should comply with the follow
- * example (case insensitive). Examples:
- *
- * "123MS" -- parses as "123 milliseconds"
- * "20S" -- parses as "20 seconds"
- * "15M" -- parses as "15 minutes" (where a minute is 60 seconds)
- * "10H" -- parses as "10 hours" (where an hour is 3600 seconds)
- * "2D" -- parses as "2 days" (where a day is 24 hours or 86400 seconds)
- * "2D3H4M5S123MS" -- parses as "2 days, 3 hours, 4 minutes, 5 seconds and 123 milliseconds"
- *
- *
- * @param key the property name
- * @param defaultValue the default value when name is not found or any error occurred
- * @return the parsed property value(in milliseconds)
- */
- long getDurationProperty(String key, long defaultValue);
-
- /**
- * Add change listener to this config instance, will be notified when any key is changed in this namespace.
- *
- * @param listener the config change listener
- */
- void addChangeListener(ConfigChangeListener listener);
-
- /**
- * Add change listener to this config instance, will only be notified when any of the interested keys is changed in this namespace.
- *
- * @param listener the config change listener
- * @param interestedKeys the keys interested by the listener
- *
- * @since 1.0.0
- */
- void addChangeListener(ConfigChangeListener listener, Set interestedKeys);
-
- /**
- * Add change listener to this config instance, will only be notified when any of the interested keys is changed in this namespace.
- *
- * @param listener the config change listener
- * @param interestedKeys the keys that the listener is interested in
- * @param interestedKeyPrefixes the key prefixes that the listener is interested in,
- * e.g. "spring." means that {@code listener} is interested in keys that starts with "spring.", such as "spring.banner", "spring.jpa", etc.
- * and "application" means that {@code listener} is interested in keys that starts with "application", such as "applicationName", "application.port", etc.
- * For more details, see {@link com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener#interestedKeyPrefixes()}
- * and {@link java.lang.String#startsWith(String)}
- *
- * @since 1.3.0
- */
- void addChangeListener(ConfigChangeListener listener, Set interestedKeys,
- Set interestedKeyPrefixes);
-
- /**
- * Remove the change listener
- *
- * @param listener the specific config change listener to remove
- * @return true if the specific config change listener is found and removed
- *
- * @since 1.1.0
- */
- boolean removeChangeListener(ConfigChangeListener listener);
-
- /**
- * Return a set of the property names
- *
- * @return the property names
- */
- Set getPropertyNames();
-
- /**
- * Return the user-defined property value with the given key, or {@code defaultValue} if the key doesn't exist.
- *
- * @param key the property name
- * @param function the transform {@link Function}. from String to user-defined type
- * @param defaultValue the default value when key is not found or any error occurred
- * @param user-defined type
- * @return the property value
- *
- * @since 1.1.0
- */
- T getProperty(String key, Function function, T defaultValue);
-
- /**
- * Return the config's source type, i.e. where is the config loaded from
- *
- * @return the config's source type
- *
- * @since 1.1.0
- */
- ConfigSourceType getSourceType();
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigChangeListener.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigChangeListener.java
deleted file mode 100644
index c303af9c712..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigChangeListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo;
-
-import com.ctrip.framework.apollo.model.ConfigChangeEvent;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigChangeListener {
- /**
- * Invoked when there is any config change for the namespace.
- * @param changeEvent the event for this change
- */
- void onChange(ConfigChangeEvent changeEvent);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFile.java
deleted file mode 100644
index 50b84a38d8e..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFile.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo;
-
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigFile {
- /**
- * Get file content of the namespace
- * @return file content, {@code null} if there is no content
- */
- String getContent();
-
- /**
- * Whether the config file has any content
- * @return true if it has content, false otherwise.
- */
- boolean hasContent();
-
- /**
- * Get the namespace of this config file instance
- * @return the namespace
- */
- String getNamespace();
-
- /**
- * Get the file format of this config file instance
- * @return the config file format enum
- */
- ConfigFileFormat getConfigFileFormat();
-
- /**
- * Add change listener to this config file instance.
- *
- * @param listener the config file change listener
- */
- void addChangeListener(ConfigFileChangeListener listener);
-
- /**
- * Remove the change listener
- *
- * @param listener the specific config change listener to remove
- * @return true if the specific config change listener is found and removed
- */
- boolean removeChangeListener(ConfigFileChangeListener listener);
-
- /**
- * Return the config's source type, i.e. where is the config loaded from
- *
- * @return the config's source type
- */
- ConfigSourceType getSourceType();
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFileChangeListener.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFileChangeListener.java
deleted file mode 100644
index 141386567e7..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigFileChangeListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo;
-
-import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigFileChangeListener {
- /**
- * Invoked when there is any config change for the namespace.
- * @param changeEvent the event for this change
- */
- void onChange(ConfigFileChangeEvent changeEvent);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java
deleted file mode 100644
index 184c5ee356d..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.internals.ConfigManager;
-import com.ctrip.framework.apollo.spi.ConfigFactory;
-import com.ctrip.framework.apollo.spi.ConfigRegistry;
-
-/**
- * Entry point for client config use
- *
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ConfigService {
- private static final ConfigService s_instance = new ConfigService();
-
- private volatile ConfigManager m_configManager;
- private volatile ConfigRegistry m_configRegistry;
-
- private ConfigManager getManager() {
- if (m_configManager == null) {
- synchronized (this) {
- if (m_configManager == null) {
- m_configManager = ApolloInjector.getInstance(ConfigManager.class);
- }
- }
- }
-
- return m_configManager;
- }
-
- private ConfigRegistry getRegistry() {
- if (m_configRegistry == null) {
- synchronized (this) {
- if (m_configRegistry == null) {
- m_configRegistry = ApolloInjector.getInstance(ConfigRegistry.class);
- }
- }
- }
-
- return m_configRegistry;
- }
-
- /**
- * Get Application's config instance.
- *
- * @return config instance
- */
- public static Config getAppConfig() {
- return getConfig(ConfigConsts.NAMESPACE_APPLICATION);
- }
-
- /**
- * Get the config instance for the namespace.
- *
- * @param namespace the namespace of the config
- * @return config instance
- */
- public static Config getConfig(String namespace) {
- return s_instance.getManager().getConfig(namespace);
- }
-
- public static ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
- return s_instance.getManager().getConfigFile(namespace, configFileFormat);
- }
-
- static void setConfig(Config config) {
- setConfig(ConfigConsts.NAMESPACE_APPLICATION, config);
- }
-
- /**
- * Manually set the config for the namespace specified, use with caution.
- *
- * @param namespace the namespace
- * @param config the config instance
- */
- static void setConfig(String namespace, final Config config) {
- s_instance.getRegistry().register(namespace, new ConfigFactory() {
- @Override
- public Config create(String namespace) {
- return config;
- }
-
- @Override
- public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) {
- return null;
- }
-
- });
- }
-
- static void setConfigFactory(ConfigFactory factory) {
- setConfigFactory(ConfigConsts.NAMESPACE_APPLICATION, factory);
- }
-
- /**
- * Manually set the config factory for the namespace specified, use with caution.
- *
- * @param namespace the namespace
- * @param factory the factory instance
- */
- static void setConfigFactory(String namespace, ConfigFactory factory) {
- s_instance.getRegistry().register(namespace, factory);
- }
-
- // for test only
- static void reset() {
- synchronized (s_instance) {
- s_instance.m_configManager = null;
- s_instance.m_configRegistry = null;
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/PropertiesCompatibleConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/PropertiesCompatibleConfigFile.java
deleted file mode 100644
index 7e428ef6d4c..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/PropertiesCompatibleConfigFile.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo;
-
-import java.util.Properties;
-
-/**
- * Config files that are properties compatible, e.g. yaml
- *
- * @since 1.3.0
- */
-public interface PropertiesCompatibleConfigFile extends ConfigFile {
-
- /**
- * @return the properties form of the config file
- *
- * @throws RuntimeException if the content could not be transformed to properties
- */
- Properties asProperties();
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/build/ApolloInjector.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/build/ApolloInjector.java
deleted file mode 100644
index 2871cc96494..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/build/ApolloInjector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.build;
-
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.internals.Injector;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.foundation.internals.ServiceBootstrap;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ApolloInjector {
- private static volatile Injector s_injector;
- private static final Object lock = new Object();
-
- private static Injector getInjector() {
- if (s_injector == null) {
- synchronized (lock) {
- if (s_injector == null) {
- try {
- s_injector = ServiceBootstrap.loadFirst(Injector.class);
- } catch (Throwable ex) {
- ApolloConfigException exception = new ApolloConfigException("Unable to initialize Apollo Injector!", ex);
- Tracer.logError(exception);
- throw exception;
- }
- }
- }
- }
-
- return s_injector;
- }
-
- public static T getInstance(Class clazz) {
- try {
- return getInjector().getInstance(clazz);
- } catch (Throwable ex) {
- Tracer.logError(ex);
- throw new ApolloConfigException(String.format("Unable to load instance for type %s!", clazz.getName()), ex);
- }
- }
-
- public static T getInstance(Class clazz, String name) {
- try {
- return getInjector().getInstance(clazz, name);
- } catch (Throwable ex) {
- Tracer.logError(ex);
- throw new ApolloConfigException(
- String.format("Unable to load instance for type %s and name %s !", clazz.getName(), name), ex);
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/ConfigSourceType.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/ConfigSourceType.java
deleted file mode 100644
index b8249472fb8..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/ConfigSourceType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.enums;
-
-/**
- * To indicate the config's source type, i.e. where is the config loaded from
- *
- * @since 1.1.0
- */
-public enum ConfigSourceType {
- REMOTE("Loaded from remote config service"), LOCAL("Loaded from local cache"), NONE("Load failed");
-
- private final String description;
-
- ConfigSourceType(String description) {
- this.description = description;
- }
-
- public String getDescription() {
- return description;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/PropertyChangeType.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/PropertyChangeType.java
deleted file mode 100644
index ec72282e113..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/enums/PropertyChangeType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.enums;
-
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public enum PropertyChangeType {
- ADDED, MODIFIED, DELETED
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigException.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigException.java
deleted file mode 100644
index 3a7483cb0c9..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.exceptions;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ApolloConfigException extends RuntimeException {
- public ApolloConfigException(String message) {
- super(message);
- }
-
- public ApolloConfigException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigStatusCodeException.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigStatusCodeException.java
deleted file mode 100644
index ea2e0fe856e..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigStatusCodeException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.exceptions;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ApolloConfigStatusCodeException extends RuntimeException{
- private final int m_statusCode;
-
- public ApolloConfigStatusCodeException(int statusCode, String message) {
- super(String.format("[status code: %d] %s", statusCode, message));
- this.m_statusCode = statusCode;
- }
-
- public ApolloConfigStatusCodeException(int statusCode, Throwable cause) {
- super(cause);
- this.m_statusCode = statusCode;
- }
-
- public int getStatusCode() {
- return m_statusCode;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
deleted file mode 100644
index 7ce41dcaf9a..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigChangeListener;
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.framework.apollo.enums.PropertyChangeType;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.model.ConfigChange;
-import com.ctrip.framework.apollo.model.ConfigChangeEvent;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
-import com.ctrip.framework.apollo.util.function.Functions;
-import com.ctrip.framework.apollo.util.parser.Parsers;
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import java.util.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public abstract class AbstractConfig implements Config {
- private static final Logger logger = LoggerFactory.getLogger(AbstractConfig.class);
-
- private static final ExecutorService m_executorService;
-
- private final List m_listeners = Lists.newCopyOnWriteArrayList();
- private final Map> m_interestedKeys = Maps.newConcurrentMap();
- private final Map> m_interestedKeyPrefixes = Maps.newConcurrentMap();
- private final ConfigUtil m_configUtil;
- private volatile Cache m_integerCache;
- private volatile Cache m_longCache;
- private volatile Cache m_shortCache;
- private volatile Cache m_floatCache;
- private volatile Cache m_doubleCache;
- private volatile Cache m_byteCache;
- private volatile Cache m_booleanCache;
- private volatile Cache m_dateCache;
- private volatile Cache m_durationCache;
- private final Map> m_arrayCache;
- private final List allCaches;
- private final AtomicLong m_configVersion; //indicate config version
-
- protected PropertiesFactory propertiesFactory;
-
- static {
- m_executorService = Executors.newCachedThreadPool(ApolloThreadFactory
- .create("Config", true));
- }
-
- public AbstractConfig() {
- m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
- m_configVersion = new AtomicLong();
- m_arrayCache = Maps.newConcurrentMap();
- allCaches = Lists.newArrayList();
- propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class);
- }
-
- @Override
- public void addChangeListener(ConfigChangeListener listener) {
- addChangeListener(listener, null);
- }
-
- @Override
- public void addChangeListener(ConfigChangeListener listener, Set interestedKeys) {
- addChangeListener(listener, interestedKeys, null);
- }
-
- @Override
- public void addChangeListener(ConfigChangeListener listener, Set interestedKeys, Set interestedKeyPrefixes) {
- if (!m_listeners.contains(listener)) {
- m_listeners.add(listener);
- if (interestedKeys != null && !interestedKeys.isEmpty()) {
- m_interestedKeys.put(listener, Sets.newHashSet(interestedKeys));
- }
- if (interestedKeyPrefixes != null && !interestedKeyPrefixes.isEmpty()) {
- m_interestedKeyPrefixes.put(listener, Sets.newHashSet(interestedKeyPrefixes));
- }
- }
- }
-
- @Override
- public boolean removeChangeListener(ConfigChangeListener listener) {
- m_interestedKeys.remove(listener);
- m_interestedKeyPrefixes.remove(listener);
- return m_listeners.remove(listener);
- }
-
- @Override
- public Integer getIntProperty(String key, Integer defaultValue) {
- try {
- if (m_integerCache == null) {
- synchronized (this) {
- if (m_integerCache == null) {
- m_integerCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_INT_FUNCTION, m_integerCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getIntProperty for %s failed, return default value %d", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Long getLongProperty(String key, Long defaultValue) {
- try {
- if (m_longCache == null) {
- synchronized (this) {
- if (m_longCache == null) {
- m_longCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_LONG_FUNCTION, m_longCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getLongProperty for %s failed, return default value %d", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Short getShortProperty(String key, Short defaultValue) {
- try {
- if (m_shortCache == null) {
- synchronized (this) {
- if (m_shortCache == null) {
- m_shortCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_SHORT_FUNCTION, m_shortCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getShortProperty for %s failed, return default value %d", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Float getFloatProperty(String key, Float defaultValue) {
- try {
- if (m_floatCache == null) {
- synchronized (this) {
- if (m_floatCache == null) {
- m_floatCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_FLOAT_FUNCTION, m_floatCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getFloatProperty for %s failed, return default value %f", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Double getDoubleProperty(String key, Double defaultValue) {
- try {
- if (m_doubleCache == null) {
- synchronized (this) {
- if (m_doubleCache == null) {
- m_doubleCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_DOUBLE_FUNCTION, m_doubleCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getDoubleProperty for %s failed, return default value %f", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Byte getByteProperty(String key, Byte defaultValue) {
- try {
- if (m_byteCache == null) {
- synchronized (this) {
- if (m_byteCache == null) {
- m_byteCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_BYTE_FUNCTION, m_byteCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getByteProperty for %s failed, return default value %d", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public Boolean getBooleanProperty(String key, Boolean defaultValue) {
- try {
- if (m_booleanCache == null) {
- synchronized (this) {
- if (m_booleanCache == null) {
- m_booleanCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_BOOLEAN_FUNCTION, m_booleanCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getBooleanProperty for %s failed, return default value %b", key,
- defaultValue), ex));
- }
- return defaultValue;
- }
-
- @Override
- public String[] getArrayProperty(String key, final String delimiter, String[] defaultValue) {
- try {
- if (!m_arrayCache.containsKey(delimiter)) {
- synchronized (this) {
- if (!m_arrayCache.containsKey(delimiter)) {
- m_arrayCache.put(delimiter, this.newCache());
- }
- }
- }
-
- Cache cache = m_arrayCache.get(delimiter);
- String[] result = cache.getIfPresent(key);
-
- if (result != null) {
- return result;
- }
-
- return getValueAndStoreToCache(key, new Function() {
- @Override
- public String[] apply(String input) {
- return input.split(delimiter);
- }
- }, cache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getArrayProperty for %s failed, return default value", key), ex));
- }
- return defaultValue;
- }
-
- @Override
- public > T getEnumProperty(String key, Class enumType, T defaultValue) {
- try {
- String value = getProperty(key, null);
-
- if (value != null) {
- return Enum.valueOf(enumType, value);
- }
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getEnumProperty for %s failed, return default value %s", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- @Override
- public Date getDateProperty(String key, Date defaultValue) {
- try {
- if (m_dateCache == null) {
- synchronized (this) {
- if (m_dateCache == null) {
- m_dateCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_DATE_FUNCTION, m_dateCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getDateProperty for %s failed, return default value %s", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- @Override
- public Date getDateProperty(String key, String format, Date defaultValue) {
- try {
- String value = getProperty(key, null);
-
- if (value != null) {
- return Parsers.forDate().parse(value, format);
- }
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getDateProperty for %s failed, return default value %s", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- @Override
- public Date getDateProperty(String key, String format, Locale locale, Date defaultValue) {
- try {
- String value = getProperty(key, null);
-
- if (value != null) {
- return Parsers.forDate().parse(value, format, locale);
- }
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getDateProperty for %s failed, return default value %s", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- @Override
- public long getDurationProperty(String key, long defaultValue) {
- try {
- if (m_durationCache == null) {
- synchronized (this) {
- if (m_durationCache == null) {
- m_durationCache = newCache();
- }
- }
- }
-
- return getValueFromCache(key, Functions.TO_DURATION_FUNCTION, m_durationCache, defaultValue);
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getDurationProperty for %s failed, return default value %d", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- @Override
- public T getProperty(String key, Function function, T defaultValue) {
- try {
- String value = getProperty(key, null);
-
- if (value != null) {
- return function.apply(value);
- }
- } catch (Throwable ex) {
- Tracer.logError(new ApolloConfigException(
- String.format("getProperty for %s failed, return default value %s", key,
- defaultValue), ex));
- }
-
- return defaultValue;
- }
-
- private T getValueFromCache(String key, Function parser, Cache cache, T defaultValue) {
- T result = cache.getIfPresent(key);
-
- if (result != null) {
- return result;
- }
-
- return getValueAndStoreToCache(key, parser, cache, defaultValue);
- }
-
- private T getValueAndStoreToCache(String key, Function parser, Cache cache, T defaultValue) {
- long currentConfigVersion = m_configVersion.get();
- String value = getProperty(key, null);
-
- if (value != null) {
- T result = parser.apply(value);
-
- if (result != null) {
- synchronized (this) {
- if (m_configVersion.get() == currentConfigVersion) {
- cache.put(key, result);
- }
- }
- return result;
- }
- }
-
- return defaultValue;
- }
-
- private Cache newCache() {
- Cache cache = CacheBuilder.newBuilder()
- .maximumSize(m_configUtil.getMaxConfigCacheSize())
- .expireAfterAccess(m_configUtil.getConfigCacheExpireTime(), m_configUtil.getConfigCacheExpireTimeUnit())
- .build();
- allCaches.add(cache);
- return cache;
- }
-
- /**
- * Clear config cache
- */
- protected void clearConfigCache() {
- synchronized (this) {
- for (Cache c : allCaches) {
- if (c != null) {
- c.invalidateAll();
- }
- }
- m_configVersion.incrementAndGet();
- }
- }
-
- /**
- * @param changes map's key is config property's key
- */
- protected void fireConfigChange(String namespace, Map changes) {
- final Set changedKeys = changes.keySet();
- final List listeners = this.findMatchedConfigChangeListeners(changedKeys);
-
- // notify those listeners
- for (ConfigChangeListener listener : listeners) {
- Set interestedChangedKeys = resolveInterestedChangedKeys(listener, changedKeys);
- InterestedConfigChangeEvent interestedConfigChangeEvent = new InterestedConfigChangeEvent(
- namespace, changes, interestedChangedKeys);
- this.notifyAsync(listener, interestedConfigChangeEvent);
- }
- }
-
- /**
- * Fire the listeners by event.
- */
- protected void fireConfigChange(final ConfigChangeEvent changeEvent) {
- final List listeners = this
- .findMatchedConfigChangeListeners(changeEvent.changedKeys());
-
- // notify those listeners
- for (ConfigChangeListener listener : listeners) {
- this.notifyAsync(listener, changeEvent);
- }
- }
-
- private List findMatchedConfigChangeListeners(Set changedKeys) {
- final List configChangeListeners = new ArrayList<>();
- for (ConfigChangeListener configChangeListener : this.m_listeners) {
- // check whether the listener is interested in this change event
- if (this.isConfigChangeListenerInterested(configChangeListener, changedKeys)) {
- configChangeListeners.add(configChangeListener);
- }
- }
- return configChangeListeners;
- }
-
- private void notifyAsync(final ConfigChangeListener listener, final ConfigChangeEvent changeEvent) {
- m_executorService.submit(new Runnable() {
- @Override
- public void run() {
- String listenerName = listener.getClass().getName();
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigChangeListener", listenerName);
- try {
- listener.onChange(changeEvent);
- transaction.setStatus(Transaction.SUCCESS);
- } catch (Throwable ex) {
- transaction.setStatus(ex);
- Tracer.logError(ex);
- logger.error("Failed to invoke config change listener {}", listenerName, ex);
- } finally {
- transaction.complete();
- }
- }
- });
- }
-
- private boolean isConfigChangeListenerInterested(ConfigChangeListener configChangeListener, Set changedKeys) {
- Set interestedKeys = m_interestedKeys.get(configChangeListener);
- Set interestedKeyPrefixes = m_interestedKeyPrefixes.get(configChangeListener);
-
- if ((interestedKeys == null || interestedKeys.isEmpty())
- && (interestedKeyPrefixes == null || interestedKeyPrefixes.isEmpty())) {
- return true; // no interested keys means interested in all keys
- }
-
- if (interestedKeys != null) {
- for (String interestedKey : interestedKeys) {
- if (changedKeys.contains(interestedKey)) {
- return true;
- }
- }
- }
-
- if (interestedKeyPrefixes != null) {
- for (String prefix : interestedKeyPrefixes) {
- for (final String changedKey : changedKeys) {
- if (changedKey.startsWith(prefix)) {
- return true;
- }
- }
- }
- }
-
- return false;
- }
-
- private Set resolveInterestedChangedKeys(ConfigChangeListener configChangeListener, Set changedKeys) {
- Set interestedChangedKeys = new HashSet<>();
-
- if (this.m_interestedKeys.containsKey(configChangeListener)) {
- Set interestedKeys = this.m_interestedKeys.get(configChangeListener);
- for (String interestedKey : interestedKeys) {
- if (changedKeys.contains(interestedKey)) {
- interestedChangedKeys.add(interestedKey);
- }
- }
- }
-
- if (this.m_interestedKeyPrefixes.containsKey(configChangeListener)) {
- Set interestedKeyPrefixes = this.m_interestedKeyPrefixes.get(configChangeListener);
- for (String interestedKeyPrefix : interestedKeyPrefixes) {
- for (String changedKey : changedKeys) {
- if (changedKey.startsWith(interestedKeyPrefix)) {
- interestedChangedKeys.add(changedKey);
- }
- }
- }
- }
-
- return Collections.unmodifiableSet(interestedChangedKeys);
- }
-
- List calcPropertyChanges(String namespace, Properties previous,
- Properties current) {
- if (previous == null) {
- previous = propertiesFactory.getPropertiesInstance();
- }
-
- if (current == null) {
- current = propertiesFactory.getPropertiesInstance();
- }
-
- Set previousKeys = previous.stringPropertyNames();
- Set currentKeys = current.stringPropertyNames();
-
- Set commonKeys = Sets.intersection(previousKeys, currentKeys);
- Set newKeys = Sets.difference(currentKeys, commonKeys);
- Set removedKeys = Sets.difference(previousKeys, commonKeys);
-
- List changes = Lists.newArrayList();
-
- for (String newKey : newKeys) {
- changes.add(new ConfigChange(namespace, newKey, null, current.getProperty(newKey),
- PropertyChangeType.ADDED));
- }
-
- for (String removedKey : removedKeys) {
- changes.add(new ConfigChange(namespace, removedKey, previous.getProperty(removedKey), null,
- PropertyChangeType.DELETED));
- }
-
- for (String commonKey : commonKeys) {
- String previousValue = previous.getProperty(commonKey);
- String currentValue = current.getProperty(commonKey);
- if (Objects.equal(previousValue, currentValue)) {
- continue;
- }
- changes.add(new ConfigChange(namespace, commonKey, previousValue, currentValue,
- PropertyChangeType.MODIFIED));
- }
-
- return changes;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigFile.java
deleted file mode 100644
index 3a1c0df077c..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigFile.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.slf4j.Logger;
-
-import com.ctrip.framework.apollo.ConfigFile;
-import com.ctrip.framework.apollo.ConfigFileChangeListener;
-import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.framework.apollo.enums.PropertyChangeType;
-import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.google.common.collect.Lists;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public abstract class AbstractConfigFile implements ConfigFile, RepositoryChangeListener {
- private static final Logger logger = DeferredLoggerFactory.getLogger(AbstractConfigFile.class);
- private static ExecutorService m_executorService;
- protected final ConfigRepository m_configRepository;
- protected final String m_namespace;
- protected final AtomicReference m_configProperties;
- private final List m_listeners = Lists.newCopyOnWriteArrayList();
- protected final PropertiesFactory propertiesFactory;
-
- private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
-
- static {
- m_executorService = Executors.newCachedThreadPool(ApolloThreadFactory
- .create("ConfigFile", true));
- }
-
- public AbstractConfigFile(String namespace, ConfigRepository configRepository) {
- m_configRepository = configRepository;
- m_namespace = namespace;
- m_configProperties = new AtomicReference<>();
- propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class);
- initialize();
- }
-
- private void initialize() {
- try {
- m_configProperties.set(m_configRepository.getConfig());
- m_sourceType = m_configRepository.getSourceType();
- } catch (Throwable ex) {
- Tracer.logError(ex);
- logger.warn("Init Apollo Config File failed - namespace: {}, reason: {}.",
- m_namespace, ExceptionUtil.getDetailMessage(ex));
- } finally {
- //register the change listener no matter config repository is working or not
- //so that whenever config repository is recovered, config could get changed
- m_configRepository.addChangeListener(this);
- }
- }
-
- @Override
- public String getNamespace() {
- return m_namespace;
- }
-
- protected abstract void update(Properties newProperties);
-
- @Override
- public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
- if (newProperties.equals(m_configProperties.get())) {
- return;
- }
- Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
- newConfigProperties.putAll(newProperties);
-
- String oldValue = getContent();
-
- update(newProperties);
- m_sourceType = m_configRepository.getSourceType();
-
- String newValue = getContent();
-
- PropertyChangeType changeType = PropertyChangeType.MODIFIED;
-
- if (oldValue == null) {
- changeType = PropertyChangeType.ADDED;
- } else if (newValue == null) {
- changeType = PropertyChangeType.DELETED;
- }
-
- this.fireConfigChange(new ConfigFileChangeEvent(m_namespace, oldValue, newValue, changeType));
-
- Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
- }
-
- @Override
- public void addChangeListener(ConfigFileChangeListener listener) {
- if (!m_listeners.contains(listener)) {
- m_listeners.add(listener);
- }
- }
-
- @Override
- public boolean removeChangeListener(ConfigFileChangeListener listener) {
- return m_listeners.remove(listener);
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return m_sourceType;
- }
-
- private void fireConfigChange(final ConfigFileChangeEvent changeEvent) {
- for (final ConfigFileChangeListener listener : m_listeners) {
- m_executorService.submit(new Runnable() {
- @Override
- public void run() {
- String listenerName = listener.getClass().getName();
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigFileChangeListener", listenerName);
- try {
- listener.onChange(changeEvent);
- transaction.setStatus(Transaction.SUCCESS);
- } catch (Throwable ex) {
- transaction.setStatus(ex);
- Tracer.logError(ex);
- logger.error("Failed to invoke config file change listener {}", listenerName, ex);
- } finally {
- transaction.complete();
- }
- }
- });
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigRepository.java
deleted file mode 100644
index 35ff55616c6..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigRepository.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
-import java.util.List;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.google.common.collect.Lists;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public abstract class AbstractConfigRepository implements ConfigRepository {
- private static final Logger logger = LoggerFactory.getLogger(AbstractConfigRepository.class);
- private List m_listeners = Lists.newCopyOnWriteArrayList();
- protected PropertiesFactory propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class);
-
- protected boolean trySync() {
- try {
- sync();
- return true;
- } catch (Throwable ex) {
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- logger
- .warn("Sync config failed, will retry. Repository {}, reason: {}", this.getClass(), ExceptionUtil
- .getDetailMessage(ex));
- }
- return false;
- }
-
- protected abstract void sync();
-
- @Override
- public void addChangeListener(RepositoryChangeListener listener) {
- if (!m_listeners.contains(listener)) {
- m_listeners.add(listener);
- }
- }
-
- @Override
- public void removeChangeListener(RepositoryChangeListener listener) {
- m_listeners.remove(listener);
- }
-
- protected void fireRepositoryChange(String namespace, Properties newProperties) {
- for (RepositoryChangeListener listener : m_listeners) {
- try {
- listener.onRepositoryChange(namespace, newProperties);
- } catch (Throwable ex) {
- Tracer.logError(ex);
- logger.error("Failed to invoke repository change listener {}", listener.getClass(), ex);
- }
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java
deleted file mode 100644
index 0fedcbea8ce..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigFile;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigManager {
- /**
- * Get the config instance for the namespace specified.
- * @param namespace the namespace
- * @return the config instance for the namespace
- */
- Config getConfig(String namespace);
-
- /**
- * Get the config file instance for the namespace specified.
- * @param namespace the namespace
- * @param configFileFormat the config file format
- * @return the config file instance for the namespace
- */
- ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigRepository.java
deleted file mode 100644
index faf4b6103ec..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigRepository.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import java.util.Properties;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigRepository {
- /**
- * Get the config from this repository.
- * @return config
- */
- Properties getConfig();
-
- /**
- * Set the fallback repo for this repository.
- * @param upstreamConfigRepository the upstream repo
- */
- void setUpstreamRepository(ConfigRepository upstreamConfigRepository);
-
- /**
- * Add change listener.
- * @param listener the listener to observe the changes
- */
- void addChangeListener(RepositoryChangeListener listener);
-
- /**
- * Remove change listener.
- * @param listener the listener to remove
- */
- void removeChangeListener(RepositoryChangeListener listener);
-
- /**
- * Return the config's source type, i.e. where is the config loaded from
- *
- * @return the config's source type
- */
- ConfigSourceType getSourceType();
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java
deleted file mode 100644
index e7cba404beb..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
-import com.ctrip.framework.apollo.core.ServiceNameConsts;
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.apollo.core.utils.DeprecatedPropertyNotifyUtil;
-import com.ctrip.framework.foundation.Foundation;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.dto.ServiceDTO;
-import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.ctrip.framework.apollo.util.http.HttpRequest;
-import com.ctrip.framework.apollo.util.http.HttpResponse;
-import com.ctrip.framework.apollo.util.http.HttpClient;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.escape.Escaper;
-import com.google.common.net.UrlEscapers;
-import com.google.gson.reflect.TypeToken;
-
-public class ConfigServiceLocator {
- private static final Logger logger = DeferredLoggerFactory.getLogger(ConfigServiceLocator.class);
- private HttpClient m_httpClient;
- private ConfigUtil m_configUtil;
- private AtomicReference> m_configServices;
- private Type m_responseType;
- private ScheduledExecutorService m_executorService;
- private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
- private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
-
- /**
- * Create a config service locator.
- */
- public ConfigServiceLocator() {
- List initial = Lists.newArrayList();
- m_configServices = new AtomicReference<>(initial);
- m_responseType = new TypeToken>() {
- }.getType();
- m_httpClient = ApolloInjector.getInstance(HttpClient.class);
- m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
- this.m_executorService = Executors.newScheduledThreadPool(1,
- ApolloThreadFactory.create("ConfigServiceLocator", true));
- initConfigServices();
- }
-
- private void initConfigServices() {
- // get from run time configurations
- List customizedConfigServices = getCustomizedConfigService();
-
- if (customizedConfigServices != null) {
- setConfigServices(customizedConfigServices);
- return;
- }
-
- // update from meta service
- this.tryUpdateConfigServices();
- this.schedulePeriodicRefresh();
- }
-
- private List getCustomizedConfigService() {
- // 1. Get from System Property
- String configServices = System.getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE);
- if (Strings.isNullOrEmpty(configServices)) {
- // 2. Get from OS environment variable
- configServices = System.getenv(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES);
- }
- if (Strings.isNullOrEmpty(configServices)) {
- // 3. Get from server.properties
- configServices = Foundation.server().getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE, null);
- }
- if (Strings.isNullOrEmpty(configServices)) {
- // 4. Get from deprecated config
- configServices = getDeprecatedCustomizedConfigService();
- }
-
- if (Strings.isNullOrEmpty(configServices)) {
- return null;
- }
-
- logger.info("Located config services from apollo.config-service configuration: {}, will not refresh config services from remote meta service!", configServices);
-
- // mock service dto list
- String[] configServiceUrls = configServices.split(",");
- List serviceDTOS = Lists.newArrayList();
-
- for (String configServiceUrl : configServiceUrls) {
- configServiceUrl = configServiceUrl.trim();
- ServiceDTO serviceDTO = new ServiceDTO();
- serviceDTO.setHomepageUrl(configServiceUrl);
- serviceDTO.setAppName(ServiceNameConsts.APOLLO_CONFIGSERVICE);
- serviceDTO.setInstanceId(configServiceUrl);
- serviceDTOS.add(serviceDTO);
- }
-
- return serviceDTOS;
- }
-
- @SuppressWarnings("deprecation")
- private String getDeprecatedCustomizedConfigService() {
- // 1. Get from System Property
- String configServices = System.getProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE);
- if (!Strings.isNullOrEmpty(configServices)) {
- DeprecatedPropertyNotifyUtil.warn(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE,
- ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE);
- }
- if (Strings.isNullOrEmpty(configServices)) {
- // 2. Get from OS environment variable
- configServices = System.getenv(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES);
- if (!Strings.isNullOrEmpty(configServices)) {
- DeprecatedPropertyNotifyUtil.warn(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES,
- ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE_ENVIRONMENT_VARIABLES);
- }
- }
- if (Strings.isNullOrEmpty(configServices)) {
- // 3. Get from server.properties
- configServices = Foundation.server().getProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE, null);
- if (!Strings.isNullOrEmpty(configServices)) {
- DeprecatedPropertyNotifyUtil.warn(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE,
- ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE);
- }
- }
- return configServices;
- }
-
- /**
- * Get the config service info from remote meta server.
- *
- * @return the services dto
- */
- public List getConfigServices() {
- if (m_configServices.get().isEmpty()) {
- updateConfigServices();
- }
-
- return m_configServices.get();
- }
-
- private boolean tryUpdateConfigServices() {
- try {
- updateConfigServices();
- return true;
- } catch (Throwable ex) {
- //ignore
- }
- return false;
- }
-
- private void schedulePeriodicRefresh() {
- this.m_executorService.scheduleAtFixedRate(
- new Runnable() {
- @Override
- public void run() {
- logger.debug("refresh config services");
- Tracer.logEvent("Apollo.MetaService", "periodicRefresh");
- tryUpdateConfigServices();
- }
- }, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
- m_configUtil.getRefreshIntervalTimeUnit());
- }
-
- private synchronized void updateConfigServices() {
- String url = assembleMetaServiceUrl();
-
- HttpRequest request = new HttpRequest(url);
- int maxRetries = 2;
- Throwable exception = null;
-
- for (int i = 0; i < maxRetries; i++) {
- Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "getConfigService");
- transaction.addData("Url", url);
- try {
- HttpResponse> response = m_httpClient.doGet(request, m_responseType);
- transaction.setStatus(Transaction.SUCCESS);
- List services = response.getBody();
- if (services == null || services.isEmpty()) {
- logConfigService("Empty response!");
- continue;
- }
- setConfigServices(services);
- return;
- } catch (Throwable ex) {
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- transaction.setStatus(ex);
- exception = ex;
- } finally {
- transaction.complete();
- }
-
- try {
- m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());
- } catch (InterruptedException ex) {
- //ignore
- }
- }
-
- throw new ApolloConfigException(
- String.format("Get config services failed from %s", url), exception);
- }
-
- private void setConfigServices(List services) {
- m_configServices.set(services);
- logConfigServices(services);
- }
-
- private String assembleMetaServiceUrl() {
- String domainName = m_configUtil.getMetaServerDomainName();
- String appId = m_configUtil.getAppId();
- String localIp = m_configUtil.getLocalIp();
-
- Map queryParams = Maps.newHashMap();
- queryParams.put("appId", queryParamEscaper.escape(appId));
- if (!Strings.isNullOrEmpty(localIp)) {
- queryParams.put("ip", queryParamEscaper.escape(localIp));
- }
-
- return domainName + "/services/config?" + MAP_JOINER.join(queryParams);
- }
-
- private void logConfigServices(List serviceDtos) {
- for (ServiceDTO serviceDto : serviceDtos) {
- logConfigService(serviceDto.getHomepageUrl());
- }
- }
-
- private void logConfigService(String serviceUrl) {
- Tracer.logEvent("Apollo.Config.Services", serviceUrl);
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java
deleted file mode 100644
index 7b17d75f0b2..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.slf4j.Logger;
-
-import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.framework.apollo.enums.PropertyChangeType;
-import com.ctrip.framework.apollo.model.ConfigChange;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.RateLimiter;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class DefaultConfig extends AbstractConfig implements RepositoryChangeListener {
-
- private static final Logger logger = DeferredLoggerFactory.getLogger(DefaultConfig.class);
- private final String m_namespace;
- private final Properties m_resourceProperties;
- private final AtomicReference m_configProperties;
- private final ConfigRepository m_configRepository;
- private final RateLimiter m_warnLogRateLimiter;
-
- private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
-
- /**
- * Constructor.
- *
- * @param namespace the namespace of this config instance
- * @param configRepository the config repository for this config instance
- */
- public DefaultConfig(String namespace, ConfigRepository configRepository) {
- m_namespace = namespace;
- m_resourceProperties = loadFromResource(m_namespace);
- m_configRepository = configRepository;
- m_configProperties = new AtomicReference<>();
- m_warnLogRateLimiter = RateLimiter.create(0.017); // 1 warning log output per minute
- initialize();
- }
-
- private void initialize() {
- try {
- updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
- } catch (Throwable ex) {
- Tracer.logError(ex);
- logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
- m_namespace, ExceptionUtil.getDetailMessage(ex));
- } finally {
- //register the change listener no matter config repository is working or not
- //so that whenever config repository is recovered, config could get changed
- m_configRepository.addChangeListener(this);
- }
- }
-
- /**
- * get property from cached repository properties file
- *
- * @param key property key
- * @return value
- */
- protected String getPropertyFromRepository(String key) {
- Properties properties = m_configProperties.get();
- if (properties != null) {
- return properties.getProperty(key);
- }
- return null;
- }
-
- /**
- * get property from additional properties file on classpath
- *
- * @param key property key
- * @return value
- */
- protected String getPropertyFromAdditional(String key) {
- Properties properties = this.m_resourceProperties;
- if (properties != null) {
- return properties.getProperty(key);
- }
- return null;
- }
-
- /**
- * try to print a warn log when can not find a property
- *
- * @param value value
- */
- protected void tryWarnLog(String value) {
- if (value == null && m_configProperties.get() == null && m_warnLogRateLimiter.tryAcquire()) {
- logger.warn(
- "Could not load config for namespace {} from Apollo, please check whether the configs are released in Apollo! Return default value now!",
- m_namespace);
- }
- }
-
- /**
- * get property names from cached repository properties file
- *
- * @return property names
- */
- protected Set getPropertyNamesFromRepository() {
- Properties properties = m_configProperties.get();
- if (properties == null) {
- return Collections.emptySet();
- }
- return this.stringPropertyNames(properties);
- }
-
- /**
- * get property names from additional properties file on classpath
- *
- * @return property names
- */
- protected Set getPropertyNamesFromAdditional() {
- Properties properties = m_resourceProperties;
- if (properties == null) {
- return Collections.emptySet();
- }
- return this.stringPropertyNames(properties);
- }
-
- @Override
- public String getProperty(String key, String defaultValue) {
- // step 1: check system properties, i.e. -Dkey=value
- String value = System.getProperty(key);
-
- // step 2: check local cached properties file
- if (value == null) {
- value = this.getPropertyFromRepository(key);
- }
-
- /*
- * step 3: check env variable, i.e. PATH=...
- * normally system environment variables are in UPPERCASE, however there might be exceptions.
- * so the caller should provide the key in the right case
- */
- if (value == null) {
- value = System.getenv(key);
- }
-
- // step 4: check properties file from classpath
- if (value == null) {
- value = this.getPropertyFromAdditional(key);
- }
-
- this.tryWarnLog(value);
-
- return value == null ? defaultValue : value;
- }
-
- @Override
- public Set getPropertyNames() {
- // propertyNames include system property and system env might cause some compatibility issues, though that looks like the correct implementation.
- Set fromRepository = this.getPropertyNamesFromRepository();
- Set fromAdditional = this.getPropertyNamesFromAdditional();
- if (fromRepository == null || fromRepository.isEmpty()) {
- return fromAdditional;
- }
- if (fromAdditional == null || fromAdditional.isEmpty()) {
- return fromRepository;
- }
- Set propertyNames = Sets
- .newLinkedHashSetWithExpectedSize(fromRepository.size() + fromAdditional.size());
- propertyNames.addAll(fromRepository);
- propertyNames.addAll(fromAdditional);
- return propertyNames;
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return m_sourceType;
- }
-
- private Set stringPropertyNames(Properties properties) {
- //jdk9以下版本Properties#enumerateStringProperties方法存在性能问题，keys() + get(k) 重复迭代, jdk9之后改为entrySet遍历.
- Map h = Maps.newLinkedHashMapWithExpectedSize(properties.size());
- for (Map.Entry e : properties.entrySet()) {
- Object k = e.getKey();
- Object v = e.getValue();
- if (k instanceof String && v instanceof String) {
- h.put((String) k, (String) v);
- }
- }
- return h.keySet();
- }
-
- @Override
- public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
- if (newProperties.equals(m_configProperties.get())) {
- return;
- }
-
- ConfigSourceType sourceType = m_configRepository.getSourceType();
- Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
- newConfigProperties.putAll(newProperties);
-
- Map actualChanges = updateAndCalcConfigChanges(newConfigProperties,
- sourceType);
-
- //check double checked result
- if (actualChanges.isEmpty()) {
- return;
- }
-
- this.fireConfigChange(m_namespace, actualChanges);
-
- Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
- }
-
- private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
- m_configProperties.set(newConfigProperties);
- m_sourceType = sourceType;
- }
-
- private Map updateAndCalcConfigChanges(Properties newConfigProperties,
- ConfigSourceType sourceType) {
- List configChanges =
- calcPropertyChanges(m_namespace, m_configProperties.get(), newConfigProperties);
-
- ImmutableMap.Builder actualChanges =
- new ImmutableMap.Builder<>();
-
- /** === Double check since DefaultConfig has multiple config sources ==== **/
-
- //1. use getProperty to update configChanges's old value
- for (ConfigChange change : configChanges) {
- change.setOldValue(this.getProperty(change.getPropertyName(), change.getOldValue()));
- }
-
- //2. update m_configProperties
- updateConfig(newConfigProperties, sourceType);
- clearConfigCache();
-
- //3. use getProperty to update configChange's new value and calc the final changes
- for (ConfigChange change : configChanges) {
- change.setNewValue(this.getProperty(change.getPropertyName(), change.getNewValue()));
- switch (change.getChangeType()) {
- case ADDED:
- if (Objects.equals(change.getOldValue(), change.getNewValue())) {
- break;
- }
- if (change.getOldValue() != null) {
- change.setChangeType(PropertyChangeType.MODIFIED);
- }
- actualChanges.put(change.getPropertyName(), change);
- break;
- case MODIFIED:
- if (!Objects.equals(change.getOldValue(), change.getNewValue())) {
- actualChanges.put(change.getPropertyName(), change);
- }
- break;
- case DELETED:
- if (Objects.equals(change.getOldValue(), change.getNewValue())) {
- break;
- }
- if (change.getNewValue() != null) {
- change.setChangeType(PropertyChangeType.MODIFIED);
- }
- actualChanges.put(change.getPropertyName(), change);
- break;
- default:
- //do nothing
- break;
- }
- }
- return actualChanges.build();
- }
-
- private Properties loadFromResource(String namespace) {
- String name = String.format("META-INF/config/%s.properties", namespace);
- InputStream in = ClassLoaderUtil.getLoader().getResourceAsStream(name);
- Properties properties = null;
-
- if (in != null) {
- properties = propertiesFactory.getPropertiesInstance();
-
- try {
- properties.load(in);
- } catch (IOException ex) {
- Tracer.logError(ex);
- logger.error("Load resource config for namespace {} failed", namespace, ex);
- } finally {
- try {
- in.close();
- } catch (IOException ex) {
- // ignore
- }
- }
- }
-
- return properties;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java
deleted file mode 100644
index f583a915ffa..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import java.util.Map;
-
-import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigFile;
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.spi.ConfigFactory;
-import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
-import com.google.common.collect.Maps;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class DefaultConfigManager implements ConfigManager {
- private ConfigFactoryManager m_factoryManager;
-
- private Map m_configs = Maps.newConcurrentMap();
- private Map m_configFiles = Maps.newConcurrentMap();
-
- public DefaultConfigManager() {
- m_factoryManager = ApolloInjector.getInstance(ConfigFactoryManager.class);
- }
-
- @Override
- public Config getConfig(String namespace) {
- Config config = m_configs.get(namespace);
-
- if (config == null) {
- synchronized (this) {
- config = m_configs.get(namespace);
-
- if (config == null) {
- ConfigFactory factory = m_factoryManager.getFactory(namespace);
-
- config = factory.create(namespace);
- m_configs.put(namespace, config);
- }
- }
- }
-
- return config;
- }
-
- @Override
- public ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
- String namespaceFileName = String.format("%s.%s", namespace, configFileFormat.getValue());
- ConfigFile configFile = m_configFiles.get(namespaceFileName);
-
- if (configFile == null) {
- synchronized (this) {
- configFile = m_configFiles.get(namespaceFileName);
-
- if (configFile == null) {
- ConfigFactory factory = m_factoryManager.getFactory(namespaceFileName);
-
- configFile = factory.createConfigFile(namespaceFileName, configFileFormat);
- m_configFiles.put(namespaceFileName, configFile);
- }
- }
- }
-
- return configFile;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultInjector.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultInjector.java
deleted file mode 100644
index 707ad6c519c..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultInjector.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer;
-import com.ctrip.framework.apollo.spi.ConfigFactory;
-import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
-import com.ctrip.framework.apollo.spi.ConfigRegistry;
-import com.ctrip.framework.apollo.spi.DefaultConfigFactory;
-import com.ctrip.framework.apollo.spi.DefaultConfigFactoryManager;
-import com.ctrip.framework.apollo.spi.DefaultConfigRegistry;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.factory.DefaultPropertiesFactory;
-import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
-import com.ctrip.framework.apollo.util.http.DefaultHttpClient;
-import com.ctrip.framework.apollo.util.http.HttpClient;
-
-import com.ctrip.framework.apollo.util.yaml.YamlParser;
-import com.ctrip.framework.foundation.internals.ServiceBootstrap;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Singleton;
-import java.util.List;
-
-/**
- * Guice injector
- * @author Jason Song(song_s@ctrip.com)
- */
-public class DefaultInjector implements Injector {
- private final com.google.inject.Injector m_injector;
- private final List m_customizers;
-
- public DefaultInjector() {
- try {
- m_injector = Guice.createInjector(new ApolloModule());
- m_customizers = ServiceBootstrap.loadAllOrdered(ApolloInjectorCustomizer.class);
- } catch (Throwable ex) {
- ApolloConfigException exception = new ApolloConfigException("Unable to initialize Guice Injector!", ex);
- Tracer.logError(exception);
- throw exception;
- }
- }
-
- @Override
- public T getInstance(Class clazz) {
- try {
- for (ApolloInjectorCustomizer customizer : m_customizers) {
- T instance = customizer.getInstance(clazz);
- if (instance != null) {
- return instance;
- }
- }
- return m_injector.getInstance(clazz);
- } catch (Throwable ex) {
- Tracer.logError(ex);
- throw new ApolloConfigException(
- String.format("Unable to load instance for %s!", clazz.getName()), ex);
- }
- }
-
- @Override
- public T getInstance(Class clazz, String name) {
- try {
- for (ApolloInjectorCustomizer customizer : m_customizers) {
- T instance = customizer.getInstance(clazz, name);
- if (instance != null) {
- return instance;
- }
- }
- //Guice does not support get instance by type and name
- return null;
- } catch (Throwable ex) {
- Tracer.logError(ex);
- throw new ApolloConfigException(
- String.format("Unable to load instance for %s with name %s!", clazz.getName(), name), ex);
- }
- }
-
- private static class ApolloModule extends AbstractModule {
- @Override
- protected void configure() {
- bind(ConfigManager.class).to(DefaultConfigManager.class).in(Singleton.class);
- bind(ConfigFactoryManager.class).to(DefaultConfigFactoryManager.class).in(Singleton.class);
- bind(ConfigRegistry.class).to(DefaultConfigRegistry.class).in(Singleton.class);
- bind(ConfigFactory.class).to(DefaultConfigFactory.class).in(Singleton.class);
- bind(ConfigUtil.class).in(Singleton.class);
- bind(HttpClient.class).to(DefaultHttpClient.class).in(Singleton.class);
- bind(ConfigServiceLocator.class).in(Singleton.class);
- bind(RemoteConfigLongPollService.class).in(Singleton.class);
- bind(YamlParser.class).in(Singleton.class);
- bind(PropertiesFactory.class).to(DefaultPropertiesFactory.class).in(Singleton.class);
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java
deleted file mode 100644
index 1a00395976e..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.core.enums.Env;
-import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.foundation.Foundation;
-import com.google.common.base.Strings;
-import org.slf4j.Logger;
-
-public class DefaultMetaServerProvider implements MetaServerProvider {
-
- public static final int ORDER = 0;
- private static final Logger logger = DeferredLoggerFactory
- .getLogger(DefaultMetaServerProvider.class);
-
- private final String metaServerAddress;
-
- public DefaultMetaServerProvider() {
- metaServerAddress = initMetaServerAddress();
- }
-
- private String initMetaServerAddress() {
- // 1. Get from System Property
- String metaAddress = System.getProperty(ConfigConsts.APOLLO_META_KEY);
- if (Strings.isNullOrEmpty(metaAddress)) {
- // 2. Get from OS environment variable, which could not contain dot and is normally in UPPER case
- metaAddress = System.getenv(ApolloClientSystemConsts.APOLLO_META_ENVIRONMENT_VARIABLES);
- }
- if (Strings.isNullOrEmpty(metaAddress)) {
- // 3. Get from server.properties
- metaAddress = Foundation.server().getProperty(ConfigConsts.APOLLO_META_KEY, null);
- }
- if (Strings.isNullOrEmpty(metaAddress)) {
- // 4. Get from app.properties
- metaAddress = Foundation.app().getProperty(ConfigConsts.APOLLO_META_KEY, null);
- }
-
- if (Strings.isNullOrEmpty(metaAddress)) {
- logger.warn(
- "Could not find meta server address, because it is not available in neither (1) JVM system property 'apollo.meta', (2) OS env variable 'APOLLO_META' (3) property 'apollo.meta' from server.properties nor (4) property 'apollo.meta' from app.properties");
- } else {
- metaAddress = metaAddress.trim();
- logger.info("Located meta services from apollo.meta configuration: {}!", metaAddress);
- }
-
- return metaAddress;
- }
-
- @Override
- public String getMetaServerAddress(Env targetEnv) {
- //for default meta server provider, we don't care the actual environment
- return metaServerAddress;
- }
-
- @Override
- public int getOrder() {
- return ORDER;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/Injector.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/Injector.java
deleted file mode 100644
index fab83b5fc9d..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/Injector.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface Injector {
-
- /**
- * Returns the appropriate instance for the given injection type
- */
- T getInstance(Class clazz);
-
- /**
- * Returns the appropriate instance for the given injection type and name
- */
- T getInstance(Class clazz, String name);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEvent.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEvent.java
deleted file mode 100644
index 2d3365070f7..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/InterestedConfigChangeEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigChangeListener;
-import com.ctrip.framework.apollo.model.ConfigChange;
-import com.ctrip.framework.apollo.model.ConfigChangeEvent;
-import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * In {@link ApolloConfigChangeListener} you set some interested key's rule, you can get those keys
- * by this class's instance.
- *
- * @author wxq
- */
-class InterestedConfigChangeEvent extends ConfigChangeEvent {
-
- /**
- * @see Config#addChangeListener(ConfigChangeListener, Set)
- * @see Config#addChangeListener(ConfigChangeListener, Set, Set)
- * @see ApolloConfigChangeListener#interestedKeys()
- * @see ApolloConfigChangeListener#interestedKeyPrefixes()
- */
- private final Set m_interestedChangedKeys;
-
- public InterestedConfigChangeEvent(String namespace,
- Map changes, Set interestedChangedKeys) {
- super(namespace, changes);
- this.m_interestedChangedKeys = interestedChangedKeys;
- }
-
- /**
- * @return interested and changed keys
- */
- @Override
- public Set interestedChangedKeys() {
- return Collections.unmodifiableSet(this.m_interestedChangedKeys);
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/JsonConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/JsonConfigFile.java
deleted file mode 100644
index 80befc927e8..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/JsonConfigFile.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class JsonConfigFile extends PlainTextConfigFile {
- public JsonConfigFile(String namespace,
- ConfigRepository configRepository) {
- super(namespace, configRepository);
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.JSON;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java
deleted file mode 100644
index f5e481161c4..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class LocalFileConfigRepository extends AbstractConfigRepository
- implements RepositoryChangeListener {
- private static final Logger logger = DeferredLoggerFactory.getLogger(LocalFileConfigRepository.class);
- private static final String CONFIG_DIR = "/config-cache";
- private final String m_namespace;
- private File m_baseDir;
- private final ConfigUtil m_configUtil;
- private volatile Properties m_fileProperties;
- private volatile ConfigRepository m_upstream;
-
- private volatile ConfigSourceType m_sourceType = ConfigSourceType.LOCAL;
-
- /**
- * Constructor.
- *
- * @param namespace the namespace
- */
- public LocalFileConfigRepository(String namespace) {
- this(namespace, null);
- }
-
- public LocalFileConfigRepository(String namespace, ConfigRepository upstream) {
- m_namespace = namespace;
- m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
- this.setLocalCacheDir(findLocalCacheDir(), false);
- this.setUpstreamRepository(upstream);
- this.trySync();
- }
-
- void setLocalCacheDir(File baseDir, boolean syncImmediately) {
- m_baseDir = baseDir;
- this.checkLocalConfigCacheDir(m_baseDir);
- if (syncImmediately) {
- this.trySync();
- }
- }
-
- private File findLocalCacheDir() {
- try {
- String defaultCacheDir = m_configUtil.getDefaultLocalCacheDir();
- Path path = Paths.get(defaultCacheDir);
- if (!Files.exists(path)) {
- Files.createDirectories(path);
- }
- if (Files.exists(path) && Files.isWritable(path)) {
- return new File(defaultCacheDir, CONFIG_DIR);
- }
- } catch (Throwable ex) {
- //ignore
- }
-
- return new File(ClassLoaderUtil.getClassPath(), CONFIG_DIR);
- }
-
- @Override
- public Properties getConfig() {
- if (m_fileProperties == null) {
- sync();
- }
- Properties result = propertiesFactory.getPropertiesInstance();
- result.putAll(m_fileProperties);
- return result;
- }
-
- @Override
- public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
- if (upstreamConfigRepository == null) {
- return;
- }
- //clear previous listener
- if (m_upstream != null) {
- m_upstream.removeChangeListener(this);
- }
- m_upstream = upstreamConfigRepository;
- upstreamConfigRepository.addChangeListener(this);
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return m_sourceType;
- }
-
- @Override
- public void onRepositoryChange(String namespace, Properties newProperties) {
- if (newProperties.equals(m_fileProperties)) {
- return;
- }
- Properties newFileProperties = propertiesFactory.getPropertiesInstance();
- newFileProperties.putAll(newProperties);
- updateFileProperties(newFileProperties, m_upstream.getSourceType());
- this.fireRepositoryChange(namespace, newProperties);
- }
-
- @Override
- protected void sync() {
- //sync with upstream immediately
- boolean syncFromUpstreamResultSuccess = trySyncFromUpstream();
-
- if (syncFromUpstreamResultSuccess) {
- return;
- }
-
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "syncLocalConfig");
- Throwable exception = null;
- try {
- transaction.addData("Basedir", m_baseDir.getAbsolutePath());
- m_fileProperties = this.loadFromLocalCacheFile(m_baseDir, m_namespace);
- m_sourceType = ConfigSourceType.LOCAL;
- transaction.setStatus(Transaction.SUCCESS);
- } catch (Throwable ex) {
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- transaction.setStatus(ex);
- exception = ex;
- //ignore
- } finally {
- transaction.complete();
- }
-
- if (m_fileProperties == null) {
- m_sourceType = ConfigSourceType.NONE;
- throw new ApolloConfigException(
- "Load config from local config failed!", exception);
- }
- }
-
- private boolean trySyncFromUpstream() {
- if (m_upstream == null) {
- return false;
- }
- try {
- updateFileProperties(m_upstream.getConfig(), m_upstream.getSourceType());
- return true;
- } catch (Throwable ex) {
- Tracer.logError(ex);
- logger
- .warn("Sync config from upstream repository {} failed, reason: {}", m_upstream.getClass(),
- ExceptionUtil.getDetailMessage(ex));
- }
- return false;
- }
-
- private synchronized void updateFileProperties(Properties newProperties, ConfigSourceType sourceType) {
- this.m_sourceType = sourceType;
- if (newProperties.equals(m_fileProperties)) {
- return;
- }
- this.m_fileProperties = newProperties;
- persistLocalCacheFile(m_baseDir, m_namespace);
- }
-
- private Properties loadFromLocalCacheFile(File baseDir, String namespace) throws IOException {
- Preconditions.checkNotNull(baseDir, "Basedir cannot be null");
-
- File file = assembleLocalCacheFile(baseDir, namespace);
- Properties properties = null;
-
- if (file.isFile() && file.canRead()) {
- InputStream in = null;
-
- try {
- in = new FileInputStream(file);
- properties = propertiesFactory.getPropertiesInstance();
- properties.load(in);
- logger.debug("Loading local config file {} successfully!", file.getAbsolutePath());
- } catch (IOException ex) {
- Tracer.logError(ex);
- throw new ApolloConfigException(String
- .format("Loading config from local cache file %s failed", file.getAbsolutePath()), ex);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- } catch (IOException ex) {
- // ignore
- }
- }
- } else {
- throw new ApolloConfigException(
- String.format("Cannot read from local cache file %s", file.getAbsolutePath()));
- }
-
- return properties;
- }
-
- void persistLocalCacheFile(File baseDir, String namespace) {
- if (baseDir == null) {
- return;
- }
- File file = assembleLocalCacheFile(baseDir, namespace);
-
- OutputStream out = null;
-
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "persistLocalConfigFile");
- transaction.addData("LocalConfigFile", file.getAbsolutePath());
- try {
- out = new FileOutputStream(file);
- m_fileProperties.store(out, "Persisted by DefaultConfig");
- transaction.setStatus(Transaction.SUCCESS);
- } catch (IOException ex) {
- ApolloConfigException exception =
- new ApolloConfigException(
- String.format("Persist local cache file %s failed", file.getAbsolutePath()), ex);
- Tracer.logError(exception);
- transaction.setStatus(exception);
- logger.warn("Persist local cache file {} failed, reason: {}.", file.getAbsolutePath(),
- ExceptionUtil.getDetailMessage(ex));
- } finally {
- if (out != null) {
- try {
- out.close();
- } catch (IOException ex) {
- //ignore
- }
- }
- transaction.complete();
- }
- }
-
- private void checkLocalConfigCacheDir(File baseDir) {
- if (baseDir.exists()) {
- return;
- }
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "createLocalConfigDir");
- transaction.addData("BaseDir", baseDir.getAbsolutePath());
- try {
- Files.createDirectory(baseDir.toPath());
- transaction.setStatus(Transaction.SUCCESS);
- } catch (IOException ex) {
- ApolloConfigException exception =
- new ApolloConfigException(
- String.format("Create local config directory %s failed", baseDir.getAbsolutePath()),
- ex);
- Tracer.logError(exception);
- transaction.setStatus(exception);
- logger.warn(
- "Unable to create local config cache directory {}, reason: {}. Will not able to cache config file.",
- baseDir.getAbsolutePath(), ExceptionUtil.getDetailMessage(ex));
- } finally {
- transaction.complete();
- }
- }
-
- File assembleLocalCacheFile(File baseDir, String namespace) {
- String fileName =
- String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
- .join(m_configUtil.getAppId(), m_configUtil.getCluster(), namespace));
- return new File(baseDir, fileName);
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
deleted file mode 100644
index f5f05d0ee19..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import java.util.Properties;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public abstract class PlainTextConfigFile extends AbstractConfigFile {
-
- public PlainTextConfigFile(String namespace, ConfigRepository configRepository) {
- super(namespace, configRepository);
- }
-
- @Override
- public String getContent() {
- if (!this.hasContent()) {
- return null;
- }
- return m_configProperties.get().getProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY);
- }
-
- @Override
- public boolean hasContent() {
- if (m_configProperties.get() == null) {
- return false;
- }
- return m_configProperties.get().containsKey(ConfigConsts.CONFIG_FILE_CONTENT_KEY);
- }
-
- @Override
- protected void update(Properties newProperties) {
- m_configProperties.set(newProperties);
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepository.java
deleted file mode 100644
index e505d18ac07..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesCompatibleFileConfigRepository.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import java.util.Properties;
-
-import com.ctrip.framework.apollo.ConfigFileChangeListener;
-import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import com.ctrip.framework.apollo.model.ConfigFileChangeEvent;
-import com.google.common.base.Preconditions;
-
-public class PropertiesCompatibleFileConfigRepository extends AbstractConfigRepository implements
- ConfigFileChangeListener {
- private final PropertiesCompatibleConfigFile configFile;
- private volatile Properties cachedProperties;
-
- public PropertiesCompatibleFileConfigRepository(PropertiesCompatibleConfigFile configFile) {
- this.configFile = configFile;
- this.configFile.addChangeListener(this);
- this.trySync();
- }
-
- @Override
- protected synchronized void sync() {
- Properties current = configFile.asProperties();
-
- Preconditions.checkState(current != null, "PropertiesCompatibleConfigFile.asProperties should never return null");
-
- if (cachedProperties != current) {
- cachedProperties = current;
- this.fireRepositoryChange(configFile.getNamespace(), cachedProperties);
- }
- }
-
- @Override
- public Properties getConfig() {
- if (cachedProperties == null) {
- sync();
- }
- return cachedProperties;
- }
-
- @Override
- public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
- //config file is the upstream, so no need to set up extra upstream
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return configFile.getSourceType();
- }
-
- @Override
- public void onChange(ConfigFileChangeEvent changeEvent) {
- this.trySync();
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
deleted file mode 100644
index 205941a7e5e..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.core.utils.PropertiesUtil;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Represents a config file that is of the file format `.properties`
- *
- * @author Jason Song(song_s@ctrip.com)
- * @author Diego Krupitza(info@diegokrupitza.com)
- */
-public class PropertiesConfigFile extends AbstractConfigFile implements
- PropertiesCompatibleConfigFile {
-
- protected AtomicReference m_contentCache;
-
- public PropertiesConfigFile(String namespace,
- ConfigRepository configRepository) {
- super(namespace, configRepository);
- m_contentCache = new AtomicReference<>();
- }
-
- @Override
- protected void update(Properties newProperties) {
- m_configProperties.set(newProperties);
- m_contentCache.set(null);
- }
-
- @Override
- public String getContent() {
- if (m_contentCache.get() == null) {
- m_contentCache.set(doGetContent());
- }
- return m_contentCache.get();
- }
-
- String doGetContent() {
- if (!this.hasContent()) {
- return null;
- }
-
- try {
- return PropertiesUtil.toString(m_configProperties.get());
- } catch (Throwable ex) {
- ApolloConfigException exception =
- new ApolloConfigException(String
- .format("Parse properties file content failed for namespace: %s, cause: %s",
- m_namespace, ExceptionUtil.getDetailMessage(ex)));
- Tracer.logError(exception);
- throw exception;
- }
- }
-
- @Override
- public boolean hasContent() {
- return m_configProperties.get() != null && !m_configProperties.get().isEmpty();
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.Properties;
- }
-
- @Override
- public Properties asProperties() {
- return this.hasContent() ? m_configProperties.get() : propertiesFactory.getPropertiesInstance();
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java
deleted file mode 100644
index 59806b2a745..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
-import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
-import com.ctrip.framework.apollo.core.dto.ServiceDTO;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
-import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
-import com.ctrip.framework.apollo.core.signature.Signature;
-import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.framework.apollo.core.utils.StringUtils;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.spi.ConfigServiceLoadBalancerClient;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.ctrip.framework.apollo.util.http.HttpRequest;
-import com.ctrip.framework.apollo.util.http.HttpResponse;
-import com.ctrip.framework.apollo.util.http.HttpClient;
-import com.ctrip.framework.foundation.internals.ServiceBootstrap;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.google.common.escape.Escaper;
-import com.google.common.net.UrlEscapers;
-import com.google.common.reflect.TypeToken;
-import com.google.common.util.concurrent.RateLimiter;
-import com.google.gson.Gson;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class RemoteConfigLongPollService {
- private static final Logger logger = LoggerFactory.getLogger(RemoteConfigLongPollService.class);
- private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
- private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
- private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
- private static final long INIT_NOTIFICATION_ID = ConfigConsts.NOTIFICATION_ID_PLACEHOLDER;
- //90 seconds, should be longer than server side's long polling timeout, which is now 60 seconds
- private static final int LONG_POLLING_READ_TIMEOUT = 90 * 1000;
- private final ExecutorService m_longPollingService;
- private final AtomicBoolean m_longPollingStopped;
- private SchedulePolicy m_longPollFailSchedulePolicyInSecond;
- private RateLimiter m_longPollRateLimiter;
- private final AtomicBoolean m_longPollStarted;
- private final Multimap m_longPollNamespaces;
- private final ConcurrentMap m_notifications;
- private final Map m_remoteNotificationMessages;//namespaceName -> watchedKey -> notificationId
- private Type m_responseType;
- private static final Gson GSON = new Gson();
- private ConfigUtil m_configUtil;
- private HttpClient m_httpClient;
- private ConfigServiceLocator m_serviceLocator;
- private final ConfigServiceLoadBalancerClient configServiceLoadBalancerClient = ServiceBootstrap.loadPrimary(
- ConfigServiceLoadBalancerClient.class);
-
- /**
- * Constructor.
- */
- public RemoteConfigLongPollService() {
- m_longPollFailSchedulePolicyInSecond = new ExponentialSchedulePolicy(1, 120); //in second
- m_longPollingStopped = new AtomicBoolean(false);
- m_longPollingService = Executors.newSingleThreadExecutor(
- ApolloThreadFactory.create("RemoteConfigLongPollService", true));
- m_longPollStarted = new AtomicBoolean(false);
- m_longPollNamespaces =
- Multimaps.synchronizedSetMultimap(HashMultimap.create());
- m_notifications = Maps.newConcurrentMap();
- m_remoteNotificationMessages = Maps.newConcurrentMap();
- m_responseType = new TypeToken>() {
- }.getType();
- m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
- m_httpClient = ApolloInjector.getInstance(HttpClient.class);
- m_serviceLocator = ApolloInjector.getInstance(ConfigServiceLocator.class);
- m_longPollRateLimiter = RateLimiter.create(m_configUtil.getLongPollQPS());
- }
-
- public boolean submit(String namespace, RemoteConfigRepository remoteConfigRepository) {
- boolean added = m_longPollNamespaces.put(namespace, remoteConfigRepository);
- m_notifications.putIfAbsent(namespace, INIT_NOTIFICATION_ID);
- if (!m_longPollStarted.get()) {
- startLongPolling();
- }
- return added;
- }
-
- private void startLongPolling() {
- if (!m_longPollStarted.compareAndSet(false, true)) {
- //already started
- return;
- }
- try {
- final String appId = m_configUtil.getAppId();
- final String cluster = m_configUtil.getCluster();
- final String dataCenter = m_configUtil.getDataCenter();
- final String secret = m_configUtil.getAccessKeySecret();
- final long longPollingInitialDelayInMills = m_configUtil.getLongPollingInitialDelayInMills();
- m_longPollingService.submit(new Runnable() {
- @Override
- public void run() {
- if (longPollingInitialDelayInMills > 0) {
- try {
- logger.debug("Long polling will start in {} ms.", longPollingInitialDelayInMills);
- TimeUnit.MILLISECONDS.sleep(longPollingInitialDelayInMills);
- } catch (InterruptedException e) {
- //ignore
- }
- }
- doLongPollingRefresh(appId, cluster, dataCenter, secret);
- }
- });
- } catch (Throwable ex) {
- m_longPollStarted.set(false);
- ApolloConfigException exception =
- new ApolloConfigException("Schedule long polling refresh failed", ex);
- Tracer.logError(exception);
- logger.warn(ExceptionUtil.getDetailMessage(exception));
- }
- }
-
- void stopLongPollingRefresh() {
- this.m_longPollingStopped.compareAndSet(false, true);
- }
-
- private void doLongPollingRefresh(String appId, String cluster, String dataCenter, String secret) {
- ServiceDTO lastServiceDto = null;
- while (!m_longPollingStopped.get() && !Thread.currentThread().isInterrupted()) {
- if (!m_longPollRateLimiter.tryAcquire(5, TimeUnit.SECONDS)) {
- //wait at most 5 seconds
- try {
- TimeUnit.SECONDS.sleep(5);
- } catch (InterruptedException e) {
- }
- }
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "pollNotification");
- String url = null;
- try {
- if (lastServiceDto == null) {
- lastServiceDto = this.resolveConfigService();
- }
-
- url =
- assembleLongPollRefreshUrl(lastServiceDto.getHomepageUrl(), appId, cluster, dataCenter,
- m_notifications);
-
- logger.debug("Long polling from {}", url);
-
- HttpRequest request = new HttpRequest(url);
- request.setReadTimeout(LONG_POLLING_READ_TIMEOUT);
- if (!StringUtils.isBlank(secret)) {
- Map headers = Signature.buildHttpHeaders(url, appId, secret);
- request.setHeaders(headers);
- }
-
- transaction.addData("Url", url);
-
- final HttpResponse> response =
- m_httpClient.doGet(request, m_responseType);
-
- logger.debug("Long polling response: {}, url: {}", response.getStatusCode(), url);
- if (response.getStatusCode() == 200 && response.getBody() != null) {
- updateNotifications(response.getBody());
- updateRemoteNotifications(response.getBody());
- transaction.addData("Result", response.getBody().toString());
- notify(lastServiceDto, response.getBody());
- }
-
- //try to load balance
- if (response.getStatusCode() == 304 && ThreadLocalRandom.current().nextBoolean()) {
- lastServiceDto = null;
- }
-
- m_longPollFailSchedulePolicyInSecond.success();
- transaction.addData("StatusCode", response.getStatusCode());
- transaction.setStatus(Transaction.SUCCESS);
- } catch (Throwable ex) {
- lastServiceDto = null;
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- transaction.setStatus(ex);
- long sleepTimeInSecond = m_longPollFailSchedulePolicyInSecond.fail();
- logger.warn(
- "Long polling failed, will retry in {} seconds. appId: {}, cluster: {}, namespaces: {}, long polling url: {}, reason: {}",
- sleepTimeInSecond, appId, cluster, assembleNamespaces(), url, ExceptionUtil.getDetailMessage(ex));
- try {
- TimeUnit.SECONDS.sleep(sleepTimeInSecond);
- } catch (InterruptedException ie) {
- //ignore
- }
- } finally {
- transaction.complete();
- }
- }
- }
-
- private void notify(ServiceDTO lastServiceDto, List notifications) {
- if (notifications == null || notifications.isEmpty()) {
- return;
- }
- for (ApolloConfigNotification notification : notifications) {
- String namespaceName = notification.getNamespaceName();
- //create a new list to avoid ConcurrentModificationException
- List toBeNotified =
- Lists.newArrayList(m_longPollNamespaces.get(namespaceName));
- ApolloNotificationMessages originalMessages = m_remoteNotificationMessages.get(namespaceName);
- ApolloNotificationMessages remoteMessages = originalMessages == null ? null : originalMessages.clone();
- //since .properties are filtered out by default, so we need to check if there is any listener for it
- toBeNotified.addAll(m_longPollNamespaces
- .get(String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue())));
- for (RemoteConfigRepository remoteConfigRepository : toBeNotified) {
- try {
- remoteConfigRepository.onLongPollNotified(lastServiceDto, remoteMessages);
- } catch (Throwable ex) {
- Tracer.logError(ex);
- }
- }
- }
- }
-
- private void updateNotifications(List deltaNotifications) {
- for (ApolloConfigNotification notification : deltaNotifications) {
- if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
- continue;
- }
- String namespaceName = notification.getNamespaceName();
- if (m_notifications.containsKey(namespaceName)) {
- m_notifications.put(namespaceName, notification.getNotificationId());
- }
- //since .properties are filtered out by default, so we need to check if there is notification with .properties suffix
- String namespaceNameWithPropertiesSuffix =
- String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue());
- if (m_notifications.containsKey(namespaceNameWithPropertiesSuffix)) {
- m_notifications.put(namespaceNameWithPropertiesSuffix, notification.getNotificationId());
- }
- }
- }
-
- private void updateRemoteNotifications(List deltaNotifications) {
- for (ApolloConfigNotification notification : deltaNotifications) {
- if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
- continue;
- }
-
- if (notification.getMessages() == null || notification.getMessages().isEmpty()) {
- continue;
- }
-
- ApolloNotificationMessages localRemoteMessages =
- m_remoteNotificationMessages.get(notification.getNamespaceName());
- if (localRemoteMessages == null) {
- localRemoteMessages = new ApolloNotificationMessages();
- m_remoteNotificationMessages.put(notification.getNamespaceName(), localRemoteMessages);
- }
-
- localRemoteMessages.mergeFrom(notification.getMessages());
- }
- }
-
- private String assembleNamespaces() {
- return STRING_JOINER.join(m_longPollNamespaces.keySet());
- }
-
- String assembleLongPollRefreshUrl(String uri, String appId, String cluster, String dataCenter,
- Map notificationsMap) {
- Map queryParams = Maps.newHashMap();
- queryParams.put("appId", queryParamEscaper.escape(appId));
- queryParams.put("cluster", queryParamEscaper.escape(cluster));
- queryParams
- .put("notifications", queryParamEscaper.escape(assembleNotifications(notificationsMap)));
-
- if (!Strings.isNullOrEmpty(dataCenter)) {
- queryParams.put("dataCenter", queryParamEscaper.escape(dataCenter));
- }
- String localIp = m_configUtil.getLocalIp();
- if (!Strings.isNullOrEmpty(localIp)) {
- queryParams.put("ip", queryParamEscaper.escape(localIp));
- }
-
- String params = MAP_JOINER.join(queryParams);
- if (!uri.endsWith("/")) {
- uri += "/";
- }
-
- return uri + "notifications/v2?" + params;
- }
-
- String assembleNotifications(Map notificationsMap) {
- List notifications = Lists.newArrayList();
- for (Map.Entry entry : notificationsMap.entrySet()) {
- ApolloConfigNotification notification = new ApolloConfigNotification(entry.getKey(), entry.getValue());
- notifications.add(notification);
- }
- return GSON.toJson(notifications);
- }
-
- private ServiceDTO resolveConfigService() {
- List configServices = this.getConfigServices();
- return this.configServiceLoadBalancerClient.chooseOneFrom(configServices);
- }
-
- private List getConfigServices() {
- List services = m_serviceLocator.getConfigServices();
- if (services.size() == 0) {
- throw new ApolloConfigException("No available config service");
- }
-
- return services;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
deleted file mode 100644
index 6008f63e84f..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.Apollo;
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.core.dto.ApolloConfig;
-import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
-import com.ctrip.framework.apollo.core.dto.ServiceDTO;
-import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
-import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
-import com.ctrip.framework.apollo.core.signature.Signature;
-import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
-import com.ctrip.framework.apollo.core.utils.StringUtils;
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.tracer.spi.Transaction;
-import com.ctrip.framework.apollo.util.ConfigUtil;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.ctrip.framework.apollo.util.http.HttpRequest;
-import com.ctrip.framework.apollo.util.http.HttpResponse;
-import com.ctrip.framework.apollo.util.http.HttpClient;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.escape.Escaper;
-import com.google.common.net.UrlEscapers;
-import com.google.common.util.concurrent.RateLimiter;
-import com.google.gson.Gson;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import org.slf4j.Logger;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class RemoteConfigRepository extends AbstractConfigRepository {
- private static final Logger logger = DeferredLoggerFactory.getLogger(RemoteConfigRepository.class);
- private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
- private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
- private static final Escaper pathEscaper = UrlEscapers.urlPathSegmentEscaper();
- private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
-
- private final ConfigServiceLocator m_serviceLocator;
- private final HttpClient m_httpClient;
- private final ConfigUtil m_configUtil;
- private final RemoteConfigLongPollService remoteConfigLongPollService;
- private volatile AtomicReference m_configCache;
- private final String m_namespace;
- private final static ScheduledExecutorService m_executorService;
- private final AtomicReference m_longPollServiceDto;
- private final AtomicReference m_remoteMessages;
- private final RateLimiter m_loadConfigRateLimiter;
- private final AtomicBoolean m_configNeedForceRefresh;
- private final SchedulePolicy m_loadConfigFailSchedulePolicy;
- private static final Gson GSON = new Gson();
-
- static {
- m_executorService = Executors.newScheduledThreadPool(1,
- ApolloThreadFactory.create("RemoteConfigRepository", true));
- }
-
- /**
- * Constructor.
- *
- * @param namespace the namespace
- */
- public RemoteConfigRepository(String namespace) {
- m_namespace = namespace;
- m_configCache = new AtomicReference<>();
- m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
- m_httpClient = ApolloInjector.getInstance(HttpClient.class);
- m_serviceLocator = ApolloInjector.getInstance(ConfigServiceLocator.class);
- remoteConfigLongPollService = ApolloInjector.getInstance(RemoteConfigLongPollService.class);
- m_longPollServiceDto = new AtomicReference<>();
- m_remoteMessages = new AtomicReference<>();
- m_loadConfigRateLimiter = RateLimiter.create(m_configUtil.getLoadConfigQPS());
- m_configNeedForceRefresh = new AtomicBoolean(true);
- m_loadConfigFailSchedulePolicy = new ExponentialSchedulePolicy(m_configUtil.getOnErrorRetryInterval(),
- m_configUtil.getOnErrorRetryInterval() * 8);
- this.trySync();
- this.schedulePeriodicRefresh();
- this.scheduleLongPollingRefresh();
- }
-
- @Override
- public Properties getConfig() {
- if (m_configCache.get() == null) {
- this.sync();
- }
- return transformApolloConfigToProperties(m_configCache.get());
- }
-
- @Override
- public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
- //remote config doesn't need upstream
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return ConfigSourceType.REMOTE;
- }
-
- private void schedulePeriodicRefresh() {
- logger.debug("Schedule periodic refresh with interval: {} {}",
- m_configUtil.getRefreshInterval(), m_configUtil.getRefreshIntervalTimeUnit());
- m_executorService.scheduleAtFixedRate(
- new Runnable() {
- @Override
- public void run() {
- Tracer.logEvent("Apollo.ConfigService", String.format("periodicRefresh: %s", m_namespace));
- logger.debug("refresh config for namespace: {}", m_namespace);
- trySync();
- Tracer.logEvent("Apollo.Client.Version", Apollo.VERSION);
- }
- }, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
- m_configUtil.getRefreshIntervalTimeUnit());
- }
-
- @Override
- protected synchronized void sync() {
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "syncRemoteConfig");
-
- try {
- ApolloConfig previous = m_configCache.get();
- ApolloConfig current = loadApolloConfig();
-
- //reference equals means HTTP 304
- if (previous != current) {
- logger.debug("Remote Config refreshed!");
- m_configCache.set(current);
- this.fireRepositoryChange(m_namespace, this.getConfig());
- }
-
- if (current != null) {
- Tracer.logEvent(String.format("Apollo.Client.Configs.%s", current.getNamespaceName()),
- current.getReleaseKey());
- }
-
- transaction.setStatus(Transaction.SUCCESS);
- } catch (Throwable ex) {
- transaction.setStatus(ex);
- throw ex;
- } finally {
- transaction.complete();
- }
- }
-
- private Properties transformApolloConfigToProperties(ApolloConfig apolloConfig) {
- Properties result = propertiesFactory.getPropertiesInstance();
- result.putAll(apolloConfig.getConfigurations());
- return result;
- }
-
- private ApolloConfig loadApolloConfig() {
- if (!m_loadConfigRateLimiter.tryAcquire(5, TimeUnit.SECONDS)) {
- //wait at most 5 seconds
- try {
- TimeUnit.SECONDS.sleep(5);
- } catch (InterruptedException e) {
- }
- }
- String appId = m_configUtil.getAppId();
- String cluster = m_configUtil.getCluster();
- String dataCenter = m_configUtil.getDataCenter();
- String secret = m_configUtil.getAccessKeySecret();
- Tracer.logEvent("Apollo.Client.ConfigMeta", STRING_JOINER.join(appId, cluster, m_namespace));
- int maxRetries = m_configNeedForceRefresh.get() ? 2 : 1;
- long onErrorSleepTime = 0; // 0 means no sleep
- Throwable exception = null;
-
- List configServices = getConfigServices();
- String url = null;
- retryLoopLabel:
- for (int i = 0; i < maxRetries; i++) {
- List randomConfigServices = Lists.newLinkedList(configServices);
- Collections.shuffle(randomConfigServices);
- //Access the server which notifies the client first
- if (m_longPollServiceDto.get() != null) {
- randomConfigServices.add(0, m_longPollServiceDto.getAndSet(null));
- }
-
- for (ServiceDTO configService : randomConfigServices) {
- if (onErrorSleepTime > 0) {
- logger.warn(
- "Load config failed, will retry in {} {}. appId: {}, cluster: {}, namespaces: {}",
- onErrorSleepTime, m_configUtil.getOnErrorRetryIntervalTimeUnit(), appId, cluster, m_namespace);
-
- try {
- m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(onErrorSleepTime);
- } catch (InterruptedException e) {
- //ignore
- }
- }
-
- url = assembleQueryConfigUrl(configService.getHomepageUrl(), appId, cluster, m_namespace,
- dataCenter, m_remoteMessages.get(), m_configCache.get());
-
- logger.debug("Loading config from {}", url);
-
- HttpRequest request = new HttpRequest(url);
- if (!StringUtils.isBlank(secret)) {
- Map headers = Signature.buildHttpHeaders(url, appId, secret);
- request.setHeaders(headers);
- }
-
- Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "queryConfig");
- transaction.addData("Url", url);
- try {
-
- HttpResponse response = m_httpClient.doGet(request, ApolloConfig.class);
- m_configNeedForceRefresh.set(false);
- m_loadConfigFailSchedulePolicy.success();
-
- transaction.addData("StatusCode", response.getStatusCode());
- transaction.setStatus(Transaction.SUCCESS);
-
- if (response.getStatusCode() == 304) {
- logger.debug("Config server responds with 304 HTTP status code.");
- return m_configCache.get();
- }
-
- ApolloConfig result = response.getBody();
-
- logger.debug("Loaded config for {}: {}", m_namespace, result);
-
- return result;
- } catch (ApolloConfigStatusCodeException ex) {
- ApolloConfigStatusCodeException statusCodeException = ex;
- //config not found
- if (ex.getStatusCode() == 404) {
- String message = String.format(
- "Could not find config for namespace - appId: %s, cluster: %s, namespace: %s, " +
- "please check whether the configs are released in Apollo!",
- appId, cluster, m_namespace);
- statusCodeException = new ApolloConfigStatusCodeException(ex.getStatusCode(),
- message);
- }
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(statusCodeException));
- transaction.setStatus(statusCodeException);
- exception = statusCodeException;
- if(ex.getStatusCode() == 404) {
- break retryLoopLabel;
- }
- } catch (Throwable ex) {
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- transaction.setStatus(ex);
- exception = ex;
- } finally {
- transaction.complete();
- }
-
- // if force refresh, do normal sleep, if normal config load, do exponential sleep
- onErrorSleepTime = m_configNeedForceRefresh.get() ? m_configUtil.getOnErrorRetryInterval() :
- m_loadConfigFailSchedulePolicy.fail();
- }
-
- }
- String message = String.format(
- "Load Apollo Config failed - appId: %s, cluster: %s, namespace: %s, url: %s",
- appId, cluster, m_namespace, url);
- throw new ApolloConfigException(message, exception);
- }
-
- String assembleQueryConfigUrl(String uri, String appId, String cluster, String namespace,
- String dataCenter, ApolloNotificationMessages remoteMessages, ApolloConfig previousConfig) {
-
- String path = "configs/%s/%s/%s";
- List pathParams =
- Lists.newArrayList(pathEscaper.escape(appId), pathEscaper.escape(cluster),
- pathEscaper.escape(namespace));
- Map queryParams = Maps.newHashMap();
-
- if (previousConfig != null) {
- queryParams.put("releaseKey", queryParamEscaper.escape(previousConfig.getReleaseKey()));
- }
-
- if (!Strings.isNullOrEmpty(dataCenter)) {
- queryParams.put("dataCenter", queryParamEscaper.escape(dataCenter));
- }
-
- String localIp = m_configUtil.getLocalIp();
- if (!Strings.isNullOrEmpty(localIp)) {
- queryParams.put("ip", queryParamEscaper.escape(localIp));
- }
-
- String label = m_configUtil.getApolloLabel();
- if (!Strings.isNullOrEmpty(label)) {
- queryParams.put("label", queryParamEscaper.escape(label));
- }
-
- if (remoteMessages != null) {
- queryParams.put("messages", queryParamEscaper.escape(GSON.toJson(remoteMessages)));
- }
-
- String pathExpanded = String.format(path, pathParams.toArray());
-
- if (!queryParams.isEmpty()) {
- pathExpanded += "?" + MAP_JOINER.join(queryParams);
- }
- if (!uri.endsWith("/")) {
- uri += "/";
- }
- return uri + pathExpanded;
- }
-
- private void scheduleLongPollingRefresh() {
- remoteConfigLongPollService.submit(m_namespace, this);
- }
-
- public void onLongPollNotified(ServiceDTO longPollNotifiedServiceDto, ApolloNotificationMessages remoteMessages) {
- m_longPollServiceDto.set(longPollNotifiedServiceDto);
- m_remoteMessages.set(remoteMessages);
- m_executorService.submit(new Runnable() {
- @Override
- public void run() {
- m_configNeedForceRefresh.set(true);
- trySync();
- }
- });
- }
-
- private List getConfigServices() {
- List services = m_serviceLocator.getConfigServices();
- if (services.size() == 0) {
- throw new ApolloConfigException("No available config service");
- }
-
- return services;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RepositoryChangeListener.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RepositoryChangeListener.java
deleted file mode 100644
index 77334d961cf..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RepositoryChangeListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import java.util.Properties;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface RepositoryChangeListener {
- /**
- * Invoked when config repository changes.
- * @param namespace the namespace of this repository change
- * @param newProperties the properties after change
- */
- void onRepositoryChange(String namespace, Properties newProperties);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java
deleted file mode 100644
index c8897bbd918..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.enums.ConfigSourceType;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ctrip.framework.apollo.model.ConfigChange;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.google.common.base.Function;
-import com.google.common.collect.Maps;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class SimpleConfig extends AbstractConfig implements RepositoryChangeListener {
- private static final Logger logger = LoggerFactory.getLogger(SimpleConfig.class);
- private final String m_namespace;
- private final ConfigRepository m_configRepository;
- private volatile Properties m_configProperties;
- private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
-
- /**
- * Constructor.
- *
- * @param namespace the namespace for this config instance
- * @param configRepository the config repository for this config instance
- */
- public SimpleConfig(String namespace, ConfigRepository configRepository) {
- m_namespace = namespace;
- m_configRepository = configRepository;
- this.initialize();
- }
-
- private void initialize() {
- try {
- updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
- } catch (Throwable ex) {
- Tracer.logError(ex);
- logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
- ExceptionUtil.getDetailMessage(ex));
- } finally {
- //register the change listener no matter config repository is working or not
- //so that whenever config repository is recovered, config could get changed
- m_configRepository.addChangeListener(this);
- }
- }
-
- @Override
- public String getProperty(String key, String defaultValue) {
- if (m_configProperties == null) {
- logger.warn("Could not load config from Apollo, always return default value!");
- return defaultValue;
- }
- return this.m_configProperties.getProperty(key, defaultValue);
- }
-
- @Override
- public Set getPropertyNames() {
- if (m_configProperties == null) {
- return Collections.emptySet();
- }
-
- return m_configProperties.stringPropertyNames();
- }
-
- @Override
- public ConfigSourceType getSourceType() {
- return m_sourceType;
- }
-
- @Override
- public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
- if (newProperties.equals(m_configProperties)) {
- return;
- }
- Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
- newConfigProperties.putAll(newProperties);
-
- List changes = calcPropertyChanges(namespace, m_configProperties, newConfigProperties);
- Map changeMap = Maps.uniqueIndex(changes,
- new Function() {
- @Override
- public String apply(ConfigChange input) {
- return input.getPropertyName();
- }
- });
-
- updateConfig(newConfigProperties, m_configRepository.getSourceType());
- clearConfigCache();
-
- this.fireConfigChange(m_namespace, changeMap);
-
- Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
- }
-
- private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
- m_configProperties = newConfigProperties;
- m_sourceType = sourceType;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java
deleted file mode 100644
index dcffbcd6b5c..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-public class TxtConfigFile extends PlainTextConfigFile {
-
- public TxtConfigFile(String namespace, ConfigRepository configRepository) {
- super(namespace, configRepository);
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.TXT;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/XmlConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/XmlConfigFile.java
deleted file mode 100644
index 8300a8360ce..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/XmlConfigFile.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class XmlConfigFile extends PlainTextConfigFile {
- public XmlConfigFile(String namespace,
- ConfigRepository configRepository) {
- super(namespace, configRepository);
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.XML;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YamlConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YamlConfigFile.java
deleted file mode 100644
index 3443d582e08..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YamlConfigFile.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.util.ExceptionUtil;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
-import com.ctrip.framework.apollo.build.ApolloInjector;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
-import com.ctrip.framework.apollo.tracer.Tracer;
-import com.ctrip.framework.apollo.util.yaml.YamlParser;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class YamlConfigFile extends PlainTextConfigFile implements PropertiesCompatibleConfigFile {
- private static final Logger logger = LoggerFactory.getLogger(YamlConfigFile.class);
- private volatile Properties cachedProperties;
-
- public YamlConfigFile(String namespace, ConfigRepository configRepository) {
- super(namespace, configRepository);
- tryTransformToProperties();
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.YAML;
- }
-
- @Override
- protected void update(Properties newProperties) {
- super.update(newProperties);
- tryTransformToProperties();
- }
-
- @Override
- public Properties asProperties() {
- if (cachedProperties == null) {
- transformToProperties();
- }
- return cachedProperties;
- }
-
- private boolean tryTransformToProperties() {
- try {
- transformToProperties();
- return true;
- } catch (Throwable ex) {
- Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
- logger.warn("yaml to properties failed, reason: {}", ExceptionUtil.getDetailMessage(ex));
- }
- return false;
- }
-
- private synchronized void transformToProperties() {
- cachedProperties = toProperties();
- }
-
- private Properties toProperties() {
- if (!this.hasContent()) {
- return propertiesFactory.getPropertiesInstance();
- }
-
- try {
- return ApolloInjector.getInstance(YamlParser.class).yamlToProperties(getContent());
- } catch (Throwable ex) {
- ApolloConfigException exception = new ApolloConfigException(
- "Parse yaml file content failed for namespace: " + m_namespace, ex);
- Tracer.logError(exception);
- throw exception;
- }
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YmlConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YmlConfigFile.java
deleted file mode 100644
index 5e922a53145..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/YmlConfigFile.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.internals;
-
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class YmlConfigFile extends YamlConfigFile {
- public YmlConfigFile(String namespace, ConfigRepository configRepository) {
- super(namespace, configRepository);
- }
-
- @Override
- public ConfigFileFormat getConfigFileFormat() {
- return ConfigFileFormat.YML;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChange.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChange.java
deleted file mode 100644
index bcc6e4e66c5..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChange.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.model;
-
-
-import com.ctrip.framework.apollo.enums.PropertyChangeType;
-
-/**
- * Holds the information for a config change.
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ConfigChange {
- private final String namespace;
- private final String propertyName;
- private String oldValue;
- private String newValue;
- private PropertyChangeType changeType;
-
- /**
- * Constructor.
- * @param namespace the namespace of the key
- * @param propertyName the key whose value is changed
- * @param oldValue the value before change
- * @param newValue the value after change
- * @param changeType the change type
- */
- public ConfigChange(String namespace, String propertyName, String oldValue, String newValue,
- PropertyChangeType changeType) {
- this.namespace = namespace;
- this.propertyName = propertyName;
- this.oldValue = oldValue;
- this.newValue = newValue;
- this.changeType = changeType;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public String getOldValue() {
- return oldValue;
- }
-
- public String getNewValue() {
- return newValue;
- }
-
- public PropertyChangeType getChangeType() {
- return changeType;
- }
-
- public void setOldValue(String oldValue) {
- this.oldValue = oldValue;
- }
-
- public void setNewValue(String newValue) {
- this.newValue = newValue;
- }
-
- public void setChangeType(PropertyChangeType changeType) {
- this.changeType = changeType;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("ConfigChange{");
- sb.append("namespace='").append(namespace).append('\'');
- sb.append(", propertyName='").append(propertyName).append('\'');
- sb.append(", oldValue='").append(oldValue).append('\'');
- sb.append(", newValue='").append(newValue).append('\'');
- sb.append(", changeType=").append(changeType);
- sb.append('}');
- return sb.toString();
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java
deleted file mode 100644
index eddf003f71c..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.model;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A change event when a namespace's config is changed.
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ConfigChangeEvent {
- private final String m_namespace;
- private final Map m_changes;
- /**
- * Constructor.
- * @param namespace the namespace of this change
- * @param changes the actual changes
- */
- public ConfigChangeEvent(String namespace,
- Map changes) {
- this.m_namespace = namespace;
- this.m_changes = changes;
- }
-
- /**
- * Get the keys changed.
- * @return the list of the keys
- */
- public Set changedKeys() {
- return m_changes.keySet();
- }
-
- /**
- * Maybe subclass override this method.
- *
- * @return interested and changed keys
- */
- public Set interestedChangedKeys() {
- return Collections.emptySet();
- }
-
- /**
- * Get a specific change instance for the key specified.
- * @param key the changed key
- * @return the change instance
- */
- public ConfigChange getChange(String key) {
- return m_changes.get(key);
- }
-
- /**
- * Check whether the specified key is changed
- * @param key the key
- * @return true if the key is changed, false otherwise.
- */
- public boolean isChanged(String key) {
- return m_changes.containsKey(key);
- }
-
- /**
- * Get the namespace of this change event.
- * @return the namespace
- */
- public String getNamespace() {
- return m_namespace;
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigFileChangeEvent.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigFileChangeEvent.java
deleted file mode 100644
index 4c3569bf86d..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigFileChangeEvent.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.model;
-
-import com.ctrip.framework.apollo.enums.PropertyChangeType;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public class ConfigFileChangeEvent {
- private final String namespace;
- private final String oldValue;
- private final String newValue;
- private final PropertyChangeType changeType;
-
- /**
- * Constructor.
- *
- * @param namespace the namespace of the config file change event
- * @param oldValue the value before change
- * @param newValue the value after change
- * @param changeType the change type
- */
- public ConfigFileChangeEvent(String namespace, String oldValue, String newValue,
- PropertyChangeType changeType) {
- this.namespace = namespace;
- this.oldValue = oldValue;
- this.newValue = newValue;
- this.changeType = changeType;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public String getOldValue() {
- return oldValue;
- }
-
- public String getNewValue() {
- return newValue;
- }
-
- public PropertyChangeType getChangeType() {
- return changeType;
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("ConfigFileChangeEvent{");
- sb.append("namespace='").append(namespace).append('\'');
- sb.append(", oldValue='").append(oldValue).append('\'');
- sb.append(", newValue='").append(newValue).append('\'');
- sb.append(", changeType=").append(changeType);
- sb.append('}');
- return sb.toString();
- }
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ApolloInjectorCustomizer.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ApolloInjectorCustomizer.java
deleted file mode 100644
index 632ba40f13f..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ApolloInjectorCustomizer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.spi;
-
-import com.ctrip.framework.apollo.core.spi.Ordered;
-import com.ctrip.framework.apollo.internals.DefaultInjector;
-import com.ctrip.framework.apollo.internals.Injector;
-
-/**
- * Allow users to inject customized instances, see {@link DefaultInjector#getInstance(java.lang.Class)}
- */
-public interface ApolloInjectorCustomizer extends Injector, Ordered {
-
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java
deleted file mode 100644
index da4223f8195..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.spi;
-
-import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigFile;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigFactory {
- /**
- * Create the config instance for the namespace.
- *
- * @param namespace the namespace
- * @return the newly created config instance
- */
- Config create(String namespace);
-
- /**
- * Create the config file instance for the namespace
- * @param namespace the namespace
- * @return the newly created config file instance
- */
- ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactoryManager.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactoryManager.java
deleted file mode 100644
index 5d77a2bca9b..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactoryManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.spi;
-
-/**
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigFactoryManager {
- /**
- * Get the config factory for the namespace.
- *
- * @param namespace the namespace
- * @return the config factory for this namespace
- */
- ConfigFactory getFactory(String namespace);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigRegistry.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigRegistry.java
deleted file mode 100644
index 8e34df6df36..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigRegistry.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.spi;
-
-/**
- * The manually config registry, use with caution!
- *
- * @author Jason Song(song_s@ctrip.com)
- */
-public interface ConfigRegistry {
- /**
- * Register the config factory for the namespace specified.
- *
- * @param namespace the namespace
- * @param factory the factory for this namespace
- */
- void register(String namespace, ConfigFactory factory);
-
- /**
- * Get the registered config factory for the namespace.
- *
- * @param namespace the namespace
- * @return the factory registered for this namespace
- */
- ConfigFactory getFactory(String namespace);
-}
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigServiceLoadBalancerClient.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigServiceLoadBalancerClient.java
deleted file mode 100644
index 29d6530af88..00000000000
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigServiceLoadBalancerClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2022 Apollo Authors
- *
- * Licensed 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 com.ctrip.framework.apollo.spi;
-
-import com.ctrip.framework.apollo.core.dto.ServiceDTO;
-import com.ctrip.framework.apollo.core.spi.Ordered;
-import com.ctrip.framework.apollo.internals.ConfigServiceLocator;
-import java.util.List;
-
-public interface ConfigServiceLoadBalancerClient extends Ordered {
-
- /**
- * choose 1 config service from multiple service instances
- *
- * @param configServices the return of {@link ConfigServiceLocator#getConfigServices()}
- * @return return 1 config service chosen, null if there is no unavailable config service
- * @throws IllegalArgumentException if arg is null of empty
- */
- ServiceDTO chooseOneFrom(List