Support for actuator

Author: TheDigitalEagle

src/main/java/com/starkandwayne/serviceregistry/ServiceRegistryApplication.java

@@ -1,13 +1,11 @@
 package com.starkandwayne.serviceregistry;
 
-import com.starkandwayne.serviceregistry.peers.Peers;
 
-import java.util.Properties;
+import java.util.LinkedList;
 
-import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +19,8 @@ public class ServiceRegistryApplication {
 	public static CloudFoundrySessionData SessionData;
 	public static SpringApplication Application;
 	private static ConfigurableApplicationContext ApplicationContext;
-	public static Peers CurrentLoadedPeers;
+	public static LinkedList<ScsPeerInfo> CurrentLoadedPeers;
+
 	public static String ServerPort;
 	public static String[] CurrentArgs;
 
@@ -33,16 +32,6 @@ public static void main(String[] args) {
 
 	}
 
-	public static void RestartApplication() {
-	
-		Thread thread = new Thread(() -> {
-	       ApplicationContext.close();
-			Application = new SpringApplication(ServiceRegistryApplication.class);
-            ApplicationContext = Application.run(CurrentArgs);
-		});
-		thread.setDaemon(false);
-        thread.start();
-	}
 
 	@Bean
 public RestTemplate restTemplate() {

src/main/java/com/starkandwayne/serviceregistry/ServiceRegistryController.java

@@ -1,10 +1,15 @@
 package com.starkandwayne.serviceregistry;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,13 +18,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.starkandwayne.serviceregistry.peers.PeerData;
-import com.starkandwayne.serviceregistry.peers.Peers;
 
 @RestController
-@RequestMapping("/cf-config")
+@RequestMapping("/config")
 public class ServiceRegistryController {
 
     @GetMapping(
@@ -32,22 +36,45 @@ public ResponseEntity<CloudFoundrySessionData> getCfSessionData() {
     @GetMapping(
         value = "/peers",
         produces = {MediaType.APPLICATION_JSON_VALUE})
-    public ResponseEntity<Peers> getPeers() {
+    public ResponseEntity<LinkedList<ScsPeerInfo>> getPeers() {
         return ResponseEntity.ok().body(ServiceRegistryApplication.CurrentLoadedPeers);
         }
 
     @PostMapping(
         value = "/peers",
         consumes = {MediaType.APPLICATION_JSON_VALUE},
         produces = {MediaType.APPLICATION_JSON_VALUE})
-    public ResponseEntity<Peers> postPeers(@RequestBody LinkedList<PeerData> listpeers) {
-        Peers peers = new Peers();
-        
-        peers.CurrentPeers = listpeers;
-        System.out.println(peers.CurrentPeers);
-        ServiceRegistryApplication.CurrentLoadedPeers = peers;
+    public ResponseEntity<LinkedList<ScsPeerInfo>> postPeers(@RequestBody LinkedList<ScsPeerInfo> listpeers) {
+       try
+       {
+        ServiceRegistryApplication.CurrentLoadedPeers = listpeers;
         System.out.println(ServiceRegistryApplication.CurrentLoadedPeers);
-       // ServiceRegistryApplication.RestartApplication();
+        UpdateEnvExcuteProcess(listpeers);
         return ResponseEntity.ok().body(ServiceRegistryApplication.CurrentLoadedPeers);
+       }
+       catch (Exception ex)
+       {
+        return ResponseEntity.badRequest().body(listpeers);
+       }
+
+        
+    }
+
+    public void UpdateEnvExcuteProcess(LinkedList<ScsPeerInfo> listpeers) throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        String json;
+        try {
+            json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(listpeers);
+            ConfigurableEnvironment environment = new StandardEnvironment();
+ MutablePropertySources propertySources = environment.getPropertySources();
+ Map<String, Object> myMap = new HashMap<>();
+ myMap.put("PATH", json);
+ propertySources.addFirst(new MapPropertySource("MY_MAP", myMap));
+        } catch (JsonProcessingException e) {
+            
+            e.printStackTrace();
         }
-}
+       
+        
+    }
+}

src/main/java/com/starkandwayne/serviceregistry/environment/ExternalPeerInfoCollector.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.starkandwayne.serviceregistry.ScsPeerInfo;
+import com.starkandwayne.serviceregistry.ServiceRegistryApplication;
+
 import java.net.URI;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
@@ -55,6 +57,14 @@ public ExternalPeerInfoCollector(ConfigurableEnvironment environment, ObjectMapp
 
    public void afterPropertiesSet() throws Exception {
       String peersSetByBrokerString = this.environment.getProperty("scs.service-registry.peers");
+      if (ServiceRegistryApplication.CurrentLoadedPeers != null)
+      if ( ServiceRegistryApplication.CurrentLoadedPeers.size() > 0) {
+         ServiceRegistryApplication.CurrentLoadedPeers.forEach((peer) -> {
+            this.peerInfoCompletionService.submit(() -> {
+               return peer;
+            });
+         });
+      }
       if (!StringUtils.isEmpty(peersSetByBrokerString)) {
          List<PeerConfigUserInput> peersSetByBroker = this.objectMapper.readValue(peersSetByBrokerString, new TypeReference<List<PeerConfigUserInput>>(){});
          this.unresolvedPeerCount.set(peersSetByBroker.size());

src/main/java/com/starkandwayne/serviceregistry/peers/PeerData.java

@@ -0,0 +1,18 @@
+eureka:
+  instance:
+    hostname: ${vcap.application.uris[0]}
+    secure-port: 443
+    secure-port-enabled: true
+    non-secure-port-enabled: false
+
+    # FIXME: remove the following two settings when this issue is resolved and released: https://github.com/spring-cloud/spring-cloud-netflix/issues/3655
+    secure-health-check-url: https://${eureka.instance.hostname}/actuator/health
+    status-page-url: https://${eureka.instance.hostname}/actuator/info
+  client:
+    # Get the new eureka server to fetch registry from the existing one at
+    # startup, so the new eureka can start "hot" and won't enforce a warmup
+    # period.
+    fetch-registry: true
+  server:
+    # try to sync up with the existing eureka for 0-downtime upgrades
+    registry-sync-retries: 1