Remove validOrgGuid validation and refactor property names in applica…

…tion.yml

src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/conf/CFServerConfig.java

@@ -15,6 +15,7 @@
 public class CFServerConfig {
   private Logger logger = Logger.getLogger(this.getClass().getName());
 
+  @Bean
   HttpServer cfServer(CFServerConfiguration config) throws IOException {
     // Define a simple request handler (example only)
     HttpRequestHandler requestHandler =
@@ -23,14 +24,14 @@ HttpServer cfServer(CFServerConfiguration config) throws IOException {
           response.setEntity(new StringEntity("Hello from CFServer!"));
         };
 
-        // Build the HTTP server
-        HttpServer server = ServerBootstrap.bootstrap()
-                .setListenerPort(config.getPort())
-                .registerHandler("*", requestHandler) // Register a default handler
-                .create();
+    // Build the HTTP server
+    HttpServer server = ServerBootstrap.bootstrap()
+            .setListenerPort(config.getPort())
+            .registerHandler("*", requestHandler) // Register a default handler
+            .create();
 
-        logger.info("Configured HttpServer on port: " + config.getPort());
-        return server;
+    logger.info("Configured HttpServer on port: " + config.getPort());
+    return server;
   }
 
     @Bean

src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/conf/CFServerConfiguration.java

@@ -22,9 +22,6 @@ public void init() {
     if (this.port <= 0) {
       throw new IllegalStateException("CF Server Port is not set");
     }
-    if (this.validOrgGuid == null || this.validOrgGuid.isEmpty()) {
-      throw new IllegalStateException("CF Server validOrgGuid is not set");
-    }
   }
 
   public long getSocketTimeout() {

src/scheduler/src/main/resources/application.yml

@@ -137,5 +137,5 @@ server:
 
 cf-server:
   port: 8082
-  valid-org-guid: "some-org-guid"
-  valid-space-guid: "some-space-guid"
+  validOrgGuid: "some-org-guid"
+  validSpaceGuid: "some-space-guid"