Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
4721bee8
Commit
4721bee8
authored
Nov 20, 2015
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow EurekaServerConfig to be overridden.
fixes gh-657
parent
415cd1d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
EurekaServerConfiguration.java
...loud/netflix/eureka/server/EurekaServerConfiguration.java
+7
-0
EurekaServerInitializerConfiguration.java
...x/eureka/server/EurekaServerInitializerConfiguration.java
+2
-5
No files found.
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java
View file @
4721bee8
...
...
@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.config.BeanDefinition
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.boot.autoconfigure.web.HttpEncodingProperties
;
import
org.springframework.boot.context.embedded.FilterRegistrationBean
;
...
...
@@ -104,6 +105,12 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
return
HasFeatures
.
namedFeature
(
"Eureka Server"
,
EurekaServerConfiguration
.
class
);
}
@Bean
@ConditionalOnMissingBean
public
EurekaServerConfig
eurekaServerConfig
()
{
return
new
EurekaServerConfigBean
();
}
//TODO: is there a better way?
@Bean
(
name
=
"spring.http.encoding.CONFIGURATION_PROPERTIES"
)
public
HttpEncodingProperties
httpEncodingProperties
()
{
...
...
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
View file @
4721bee8
...
...
@@ -17,12 +17,8 @@
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
server
;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletContextEvent
;
import
lombok.extern.apachecommons.CommonsLog
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.cloud.netflix.eureka.server.event.EurekaRegistryAvailableEvent
;
import
org.springframework.cloud.netflix.eureka.server.event.EurekaServerStartedEvent
;
import
org.springframework.context.ApplicationContext
;
...
...
@@ -34,11 +30,12 @@ import org.springframework.web.context.ServletContextAware;
import
com.netflix.eureka.EurekaServerConfig
;
import
lombok.extern.apachecommons.CommonsLog
;
/**
* @author Dave Syer
*/
@Configuration
@EnableConfigurationProperties
(
EurekaServerConfigBean
.
class
)
@CommonsLog
public
class
EurekaServerInitializerConfiguration
implements
ServletContextAware
,
SmartLifecycle
,
Ordered
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment