Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moves EurekaServerConfiguration to auto-configuration
Eureka ServerConfiguration is now auto-configuration based, instead of being explicitly specified via configuration pulled in through @EnableEurekaServer. This way specific beans can be conditionally overridden, configuration can be re-ordered. Supports PeerEurekaNodes bean to be overridden by the user Fixes gh-1717
- Loading branch information
1 parent
208a741
commit 99d9b17
Showing
6 changed files
with
145 additions
and
8 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
38 changes: 38 additions & 0 deletions
38
...java/org/springframework/cloud/netflix/eureka/server/EurekaServerMarkerConfiguration.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,38 @@ | ||
| /* | ||
| * Copyright 2017 the original author or 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 org.springframework.cloud.netflix.eureka.server; | ||
|
|
||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| /** | ||
| * Responsible for adding in a marker bean to activate | ||
| * {@link EurekaServerAutoConfiguration} | ||
| * | ||
| * @author Biju Kunjummen | ||
| */ | ||
| @Configuration | ||
| public class EurekaServerMarkerConfiguration { | ||
|
|
||
| @Bean | ||
| public Marker eurekaServerMarkerBean() { | ||
| return new Marker(); | ||
| } | ||
|
|
||
| class Marker { | ||
| } | ||
| } |
2 changes: 2 additions & 0 deletions
2
spring-cloud-netflix-eureka-server/src/main/resources/META-INF/spring.factories
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,2 @@ | ||
| org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ | ||
| org.springframework.cloud.netflix.eureka.server.EurekaServerAutoConfiguration |
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
87 changes: 87 additions & 0 deletions
87
.../test/java/org/springframework/cloud/netflix/eureka/server/EurekaCustomPeerNodesTest.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,87 @@ | ||
| /* | ||
| * Copyright 2013-2017 the original author or 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 org.springframework.cloud.netflix.eureka.server; | ||
|
|
||
| import static org.junit.Assert.*; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.autoconfigure.EnableAutoConfiguration; | ||
| import org.springframework.boot.builder.SpringApplicationBuilder; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
|
|
||
| import com.netflix.appinfo.ApplicationInfoManager; | ||
| import com.netflix.discovery.EurekaClientConfig; | ||
| import com.netflix.eureka.EurekaServerConfig; | ||
| import com.netflix.eureka.cluster.PeerEurekaNodes; | ||
| import com.netflix.eureka.registry.PeerAwareInstanceRegistry; | ||
| import com.netflix.eureka.resources.ServerCodecs; | ||
|
|
||
| @RunWith(SpringRunner.class) | ||
| @SpringBootTest(classes = EurekaCustomPeerNodesTest.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = { | ||
| "spring.application.name=eureka", "server.contextPath=/context", | ||
| "management.security.enabled=false" }) | ||
| public class EurekaCustomPeerNodesTest { | ||
|
|
||
| @Autowired | ||
| private PeerEurekaNodes peerEurekaNodes; | ||
|
|
||
| @Test | ||
| public void testCustomPeerNodesShouldTakePrecedenceOverDefault() { | ||
| assertTrue("PeerEurekaNodes should be the user created one", | ||
| peerEurekaNodes instanceof CustomEurekaPeerNodes); | ||
| } | ||
|
|
||
| @Configuration | ||
| @EnableAutoConfiguration | ||
| @EnableEurekaServer | ||
| protected static class Application { | ||
|
|
||
| public static void main(String[] args) { | ||
| new SpringApplicationBuilder(ApplicationContextTests.Application.class) | ||
| .properties("spring.application.name=eureka", | ||
| "server.contextPath=/context") | ||
| .run(args); | ||
| } | ||
|
|
||
| @Bean | ||
| public PeerEurekaNodes myPeerEurekaNodes(PeerAwareInstanceRegistry registry, | ||
| EurekaServerConfig eurekaServerConfig, | ||
| EurekaClientConfig eurekaClientConfig, ServerCodecs serverCodecs, | ||
| ApplicationInfoManager applicationInfoManager) { | ||
| return new CustomEurekaPeerNodes(registry, eurekaServerConfig, | ||
| eurekaClientConfig, serverCodecs, applicationInfoManager); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private static class CustomEurekaPeerNodes extends PeerEurekaNodes { | ||
|
|
||
| public CustomEurekaPeerNodes(PeerAwareInstanceRegistry registry, | ||
| EurekaServerConfig serverConfig, EurekaClientConfig clientConfig, | ||
| ServerCodecs serverCodecs, | ||
| ApplicationInfoManager applicationInfoManager) { | ||
| super(registry, serverConfig, clientConfig, serverCodecs, | ||
| applicationInfoManager); | ||
| } | ||
| } | ||
|
|
||
| } |