diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index eb6d1c342..fc6eb5d09 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java @@ -74,11 +74,11 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order @Autowired private EurekaInstanceConfigBean instanceConfig; - @Autowired(required = false) - private HealthCheckHandler healthCheckHandler; + @Autowired(required = false) + private HealthCheckHandler healthCheckHandler; - @Autowired - private ApplicationContext context; + @Autowired + private ApplicationContext context; @PreDestroy public void close() { @@ -90,16 +90,19 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order private void closeDiscoveryClientJersey() { logger.info("Closing DiscoveryClient.jerseyClient"); Field jerseyClientField = ReflectionUtils.findField( - com.netflix.discovery.DiscoveryClient.class, - "discoveryJerseyClient", + com.netflix.discovery.DiscoveryClient.class, "discoveryJerseyClient", EurekaJerseyClient.JerseyClient.class); if (jerseyClientField != null) { try { jerseyClientField.setAccessible(true); - Object obj = jerseyClientField.get(DiscoveryManager.getInstance().getDiscoveryClient()); - EurekaJerseyClient.JerseyClient jerseyClient = (EurekaJerseyClient.JerseyClient) obj; - jerseyClient.destroyResources(); - } catch (Exception e) { + Object obj = jerseyClientField.get(DiscoveryManager.getInstance() + .getDiscoveryClient()); + if (obj != null) { + EurekaJerseyClient.JerseyClient jerseyClient = (EurekaJerseyClient.JerseyClient) obj; + jerseyClient.destroyResources(); + } + } + catch (Exception e) { logger.error("Error closing DiscoveryClient.jerseyClient", e); } } @@ -107,32 +110,36 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order @Override public void start() { - //only set the port if the nonSecurePort is 0 and this.port != 0 + // only set the port if the nonSecurePort is 0 and this.port != 0 if (port.get() != 0 && instanceConfig.getNonSecurePort() == 0) { instanceConfig.setNonSecurePort(port.get()); - } - //only initialize if nonSecurePort is greater than 0 and it isn't already running - //because of containerPortInitializer below - if (!running.get() && instanceConfig.getNonSecurePort() > 0) { - discoveryManagerIntitializer().init(); + } + // only initialize if nonSecurePort is greater than 0 and it isn't already running + // because of containerPortInitializer below + if (!running.get() && instanceConfig.getNonSecurePort() > 0) { + discoveryManagerIntitializer().init(); - logger.info("Registering application {} with eureka with status {}", - instanceConfig.getAppname(), instanceConfig.getInitialStatus()); - ApplicationInfoManager.getInstance().setInstanceStatus(instanceConfig.getInitialStatus()); + logger.info("Registering application {} with eureka with status {}", + instanceConfig.getAppname(), instanceConfig.getInitialStatus()); + ApplicationInfoManager.getInstance().setInstanceStatus( + instanceConfig.getInitialStatus()); - if (healthCheckHandler != null) { - DiscoveryManager.getInstance().getDiscoveryClient().registerHealthCheck(healthCheckHandler); - } - context.publishEvent(new InstanceRegisteredEvent<>(this, instanceConfig)); - running.set(true); - } + if (healthCheckHandler != null) { + DiscoveryManager.getInstance().getDiscoveryClient() + .registerHealthCheck(healthCheckHandler); + } + context.publishEvent(new InstanceRegisteredEvent<>(this, instanceConfig)); + running.set(true); + } } @Override public void stop() { - logger.info("Unregistering application {} with eureka with status OUT_OF_SERVICE", + logger.info( + "Unregistering application {} with eureka with status OUT_OF_SERVICE", instanceConfig.getAppname()); - ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.OUT_OF_SERVICE); + ApplicationInfoManager.getInstance().setInstanceStatus( + InstanceStatus.OUT_OF_SERVICE); running.set(false); } @@ -161,11 +168,11 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order return order; } - @Bean - @ConditionalOnMissingBean(DiscoveryManagerInitializer.class) - public DiscoveryManagerInitializer discoveryManagerIntitializer() { - return new DiscoveryManagerInitializer(); - } + @Bean + @ConditionalOnMissingBean(DiscoveryManagerInitializer.class) + public DiscoveryManagerInitializer discoveryManagerIntitializer() { + return new DiscoveryManagerInitializer(); + } @Bean @Lazy @@ -175,10 +182,10 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order return DiscoveryManager.getInstance().getDiscoveryClient(); } - @Bean - public DiscoveryClient discoveryClient() { - return new EurekaDiscoveryClient(); - } + @Bean + public DiscoveryClient discoveryClient() { + return new EurekaDiscoveryClient(); + } @Bean protected ApplicationListener containerPortInitializer() { @@ -187,18 +194,18 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order @Override public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) { // TODO: take SSL into account when Spring Boot 1.2 is available - EurekaDiscoveryClientConfiguration.this.port.compareAndSet(0, event.getEmbeddedServletContainer() - .getPort()); + EurekaDiscoveryClientConfiguration.this.port.compareAndSet(0, event + .getEmbeddedServletContainer().getPort()); EurekaDiscoveryClientConfiguration.this.start(); } }; } - @Bean @ConditionalOnMissingBean @ConditionalOnBean(MetricReader.class) - public EurekaHealthIndicator eurekaHealthIndicator(EurekaInstanceConfig config, MetricReader metrics) { + public EurekaHealthIndicator eurekaHealthIndicator(EurekaInstanceConfig config, + MetricReader metrics) { return new EurekaHealthIndicator(eurekaDiscoveryClient(), metrics, config); } } diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 7b528c576..86c3ae7e0 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -67,16 +67,6 @@ com.netflix.eureka eureka-core - - org.webjars - jquery - runtime - - - org.webjars - bootstrap - runtime - org.projectlombok lombok @@ -138,10 +128,23 @@ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory ${project.build.directory}/generated-resources/static/eureka/css + ${project.build.directory}/generated-resources/static/eureka/js ${project.build.directory}/wro/wro.xml ${basedir}/src/main/wro/wro.properties ${basedir}/src/main/wro + + + org.webjars + jquery + 2.1.1 + + + org.webjars + bootstrap + 3.2.0 + + diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.eot b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.eot deleted file mode 100644 index 4a4ca865d..000000000 Binary files a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.svg b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.svg deleted file mode 100644 index e3e2dc739..000000000 --- a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.ttf b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.ttf deleted file mode 100644 index 67fa00bf8..000000000 Binary files a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.woff b/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.woff deleted file mode 100644 index 8c54182aa..000000000 Binary files a/spring-cloud-netflix-eureka-server/src/main/resources/static/eureka/fonts/bootstrap/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl index 0eb6f4af7..31ad8c0c1 100644 --- a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl +++ b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl @@ -60,8 +60,7 @@ - - + - +