-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reduce bootstrap time in the situation with large properties (#3800)
- Loading branch information
Showing
8 changed files
with
219 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
...src/main/java/com/ctrip/framework/apollo/spring/config/CompositeConfigPropertySource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2021 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.spring.config; | ||
|
|
||
| import com.ctrip.framework.apollo.ConfigChangeListener; | ||
| import com.ctrip.framework.apollo.model.ConfigChangeEvent; | ||
| import org.springframework.core.env.CompositePropertySource; | ||
| import org.springframework.core.env.PropertySource; | ||
|
|
||
| /** | ||
| * @author Shawyeok ([email protected]) | ||
| */ | ||
| public class CompositeConfigPropertySource extends CompositePropertySource implements | ||
| ConfigChangeListener { | ||
|
|
||
| private String[] names; | ||
|
|
||
| public CompositeConfigPropertySource(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getPropertyNames() { | ||
| String[] propertyNames = this.names; | ||
| if (propertyNames == null) { | ||
| this.names = propertyNames = super.getPropertyNames(); | ||
| } | ||
| return propertyNames; | ||
| } | ||
|
|
||
| @Override | ||
| public void addPropertySource(PropertySource<?> propertySource) { | ||
| super.addPropertySource(propertySource); | ||
| if (propertySource instanceof ConfigPropertySource) { | ||
| ((ConfigPropertySource) propertySource).addChangeListener(this); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void addFirstPropertySource(PropertySource<?> propertySource) { | ||
| super.addFirstPropertySource(propertySource); | ||
| if (propertySource instanceof ConfigPropertySource) { | ||
| ((ConfigPropertySource) propertySource).addChangeListener(this); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onChange(ConfigChangeEvent changeEvent) { | ||
| // clear property names cache if any sources has changed | ||
| this.names = null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
...test/java/com/ctrip/framework/apollo/spring/config/CompositeConfigPropertySourceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright 2021 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.spring.config; | ||
|
|
||
| import static org.junit.Assert.assertArrayEquals; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertSame; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.Matchers.any; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import com.ctrip.framework.apollo.ConfigChangeListener; | ||
| import com.ctrip.framework.apollo.model.ConfigChangeEvent; | ||
| import java.util.Collection; | ||
| import java.util.Iterator; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import org.assertj.core.util.Arrays; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.invocation.InvocationOnMock; | ||
| import org.mockito.runners.MockitoJUnitRunner; | ||
| import org.mockito.stubbing.Answer; | ||
| import org.springframework.core.env.PropertySource; | ||
|
|
||
| /** | ||
| * @author Shawyeok ([email protected]) | ||
| */ | ||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class CompositeConfigPropertySourceTest { | ||
|
|
||
| private CompositeConfigPropertySource compositeSource; | ||
|
|
||
| @Mock | ||
| private ConfigPropertySource configPropertySource; | ||
|
|
||
| private List<ConfigChangeListener> listeners; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| compositeSource = new CompositeConfigPropertySource("testCompositeSource"); | ||
| listeners = new LinkedList<>(); | ||
| Mockito.doAnswer(new Answer() { | ||
| @Override | ||
| public Object answer(InvocationOnMock invocation) throws Throwable { | ||
| ConfigChangeListener listener = invocation.getArgumentAt(0, ConfigChangeListener.class); | ||
| listeners.add(listener); | ||
| return Void.class; | ||
| } | ||
| }).when(configPropertySource).addChangeListener(any(ConfigChangeListener.class)); | ||
| compositeSource.addPropertySource(configPropertySource); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetPropertyNames() { | ||
| String[] propertyNames = Arrays.array("propertyName"); | ||
| String[] anotherPropertyNames = Arrays.array("propertyName", "anotherPropertyName"); | ||
|
|
||
| when(configPropertySource.getPropertyNames()).thenReturn(propertyNames, anotherPropertyNames); | ||
|
|
||
| String[] returnedPropertyNames = compositeSource.getPropertyNames(); | ||
| assertArrayEquals(propertyNames, returnedPropertyNames); | ||
| assertSame(returnedPropertyNames, compositeSource.getPropertyNames()); | ||
|
|
||
| listeners.get(0).onChange(new ConfigChangeEvent(null, null)); | ||
|
|
||
| returnedPropertyNames = compositeSource.getPropertyNames(); | ||
| assertArrayEquals(anotherPropertyNames, returnedPropertyNames); | ||
| assertSame(returnedPropertyNames, compositeSource.getPropertyNames()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddPropertySource() { | ||
| verify(configPropertySource, times(1)) | ||
| .addChangeListener(any(CompositeConfigPropertySource.class)); | ||
| assertEquals(1, listeners.size()); | ||
| assertTrue(compositeSource.getPropertySources().contains(configPropertySource)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddFirstPropertySource() { | ||
| ConfigPropertySource anotherSource = mock(ConfigPropertySource.class); | ||
| final List<ConfigChangeListener> anotherListenerList = new LinkedList<>(); | ||
| Mockito.doAnswer(new Answer() { | ||
| @Override | ||
| public Object answer(InvocationOnMock invocation) throws Throwable { | ||
| ConfigChangeListener listener = invocation.getArgumentAt(0, ConfigChangeListener.class); | ||
| anotherListenerList.add(listener); | ||
| return Void.class; | ||
| } | ||
| }).when(anotherSource).addChangeListener(any(ConfigChangeListener.class)); | ||
| compositeSource.addFirstPropertySource(anotherSource); | ||
|
|
||
| Collection<PropertySource<?>> propertySources = compositeSource.getPropertySources(); | ||
| Iterator<PropertySource<?>> it = propertySources.iterator(); | ||
|
|
||
| assertEquals(2, propertySources.size()); | ||
| assertEquals(1, anotherListenerList.size()); | ||
| assertSame(anotherSource, it.next()); | ||
| assertSame(configPropertySource, it.next()); | ||
| } | ||
| } |