Merge 4e0adbd into 1824122

HLTech · May 25, 2020 · 0962125 · 0962125
2 parents 1824122 + 4e0adbd
commit 0962125
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 250 deletions.
diff --git a/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/UpdateServicesTask.java b/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/UpdateServicesTask.java
@@ -1,8 +1,7 @@
 package com.hltech.contracts.judged.agent;
 
 import com.hltech.contracts.judged.agent.JudgeDPublisher.ServiceForm;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -11,11 +10,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Component
 public class UpdateServicesTask {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServicesTask.class);
-
     private String environment;
     private String space;
     private ServiceLocator serviceLocator;
@@ -36,9 +34,9 @@ public UpdateServicesTask(
 
     @Scheduled(fixedDelay = 5_000, initialDelay = 10_000)
     public void updateServices() {
-        LOGGER.debug("Searching for available services...");
+        log.debug("Searching for available services...");
         Set<ServiceLocator.Service> serviceForms = serviceLocator.locateServices();
-        LOGGER.debug("Done - found following services: " + serviceForms);
+        log.debug("Done - found following services: " + serviceForms);
         publisher.publish(
             environment,
             space,

diff --git a/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/config/BeanFactory.java b/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/config/BeanFactory.java
@@ -7,8 +7,6 @@
 import feign.Retryer;
 import feign.Target;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
@@ -34,8 +32,6 @@
 @EnableScheduling
 public class BeanFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BeanFactory.class);
-
     @Bean
     public ObjectMapper objectMapper() {
         return new ObjectMapper();

diff --git a/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/HLTechBeanFactory.java b/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/HLTechBeanFactory.java
diff --git a/...-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/HLTechServiceLocator.java b/...-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/HLTechServiceLocator.java
diff --git a/...rc/main/java/com/hltech/contracts/judged/agent/hltech/KubernetesEnvironmentException.java b/...rc/main/java/com/hltech/contracts/judged/agent/hltech/KubernetesEnvironmentException.java
diff --git a/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/PodClient.java b/judge-d-agent/src/main/java/com/hltech/contracts/judged/agent/hltech/PodClient.java
diff --git a/...nt/src/test/groovy/com/hltech/contracts/judged/agent/hltech/HLTechServiceLocatorUT.groovy b/...nt/src/test/groovy/com/hltech/contracts/judged/agent/hltech/HLTechServiceLocatorUT.groovy