SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaces deprecations

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-17 17:13:11 -05:00
parent 09aad0d92a
commit a389b4b43b
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/BaseDiscoveryClientConfigServiceBootstrapConfigurationTests.java
View File

@@ -48,8 +48,8 @@ public abstract class BaseDiscoveryClientConfigServiceBootstrapConfigurationTest
protected DiscoveryClient client = Mockito.mock(DiscoveryClient.class);
protected ServiceInstance info = new DefaultServiceInstance("app", "foo", 8877,
false);
protected ServiceInstance info = new DefaultServiceInstance("app:8877", "app", "foo",
8877, false);
@After
public void close() {

10
spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java
View File

@@ -72,7 +72,7 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests
@Test
public void secureWhenRequested() throws Exception {
this.info = new DefaultServiceInstance("app", "foo", 443, true);
this.info = new DefaultServiceInstance("app:443", "app", "foo", 443, true);
givenDiscoveryClientReturnsInfo();
setup("spring.cloud.config.discovery.enabled=true");
@@ -85,10 +85,10 @@ public class DiscoveryClientConfigServiceBootstrapConfigurationTests
@Test
public void multipleInstancesReturnedFromDiscovery() {
ServiceInstance info1 = new DefaultServiceInstance("app", "localhost", 8888,
true);
ServiceInstance info2 = new DefaultServiceInstance("app", "localhost1", 8888,
false);
ServiceInstance info1 = new DefaultServiceInstance("app1:8888", "app",
"localhost", 8888, true);
ServiceInstance info2 = new DefaultServiceInstance("app2:8888", "app",
"localhost1", 8888, false);
givenDiscoveryClientReturnsInfoForMultipleInstances(info1, info2);
setup("spring.cloud.config.discovery.enabled=true");

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java
View File

@@ -77,8 +77,8 @@ public class CompositeEnvironmentBeanFactoryPostProcessor
Binder binder = Binder.get(environment);
String environmentConfigurationPropertyName = String
.format("spring.cloud.config.server.composite[%d]", index);
P properties = binder.bind(environmentConfigurationPropertyName, propertiesClass)
.orElseCreate(propertiesClass);
P properties = binder.bindOrCreate(environmentConfigurationPropertyName,
propertiesClass);
properties.setOrder(index + 1);
return properties;
}

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ConfigClientOnIntegrationTests.java
View File

@@ -49,8 +49,8 @@ import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.anyString;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = TestConfiguration.class,

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/encryption/EncryptionControllerTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.security.crypto.encrypt.TextEncryptor;
import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

6
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
View File

@@ -76,9 +76,9 @@ import org.springframework.core.env.StandardEnvironment;
import static junit.framework.TestCase.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.spy;

4
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/GenericResourceRepositoryTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.rules.ExpectedException;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.cloud.config.server.environment.NativeEnvironmentProperties;
import org.springframework.cloud.config.server.environment.NativeEnvironmentRepository;
import org.springframework.cloud.config.server.environment.NativeEnvironmentRepositoryTests;
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.containsString;
public class GenericResourceRepositoryTests {
@Rule
public OutputCapture output = new OutputCapture();
public OutputCaptureRule output = new OutputCaptureRule();
@Rule
public ExpectedException exception = ExpectedException.none();

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
View File

@@ -40,7 +40,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.isNull;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;