Removed unnecessary publics

HLTech · Oct 7, 2021 · 0caf3fd · 0caf3fd
1 parent b6c4574
commit 0caf3fd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/UpdateServicesTask.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/UpdateServicesTask.java
@@ -13,13 +13,13 @@
 @Component
 public class UpdateServicesTask {
 
-    private String environment;
-    private String space;
-    private ServiceLocator serviceLocator;
-    private JudgeDPublisher publisher;
+    private final String environment;
+    private final String space;
+    private final ServiceLocator serviceLocator;
+    private final JudgeDPublisher publisher;
 
     @Autowired
-    public UpdateServicesTask(
+    UpdateServicesTask(
         @Value("${hltech.contracts.judge-d.environment}") String environment,
         @Value("${hltech.contracts.judge-d.space:default}") String space,
         ServiceLocator serviceLocator,
@@ -49,6 +49,4 @@ public void updateServices() {
     private static JudgeDPublisher.ServiceForm toForm(ServiceLocator.Service service) {
         return new JudgeDPublisher.ServiceForm(service.getName(), service.getVersion());
     }
-
-
 }
diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/config/BeanFactory.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/config/BeanFactory.java
@@ -30,20 +30,20 @@
 
 @Configuration
 @EnableScheduling
-public class BeanFactory {
+class BeanFactory {
 
     @Bean
-    public ObjectMapper objectMapper() {
+    ObjectMapper objectMapper() {
         return new ObjectMapper();
     }
 
     @Bean
-    public JudgeDPublisher judgeDEnvironmentPublisher(Feign feign, @Value("${hltech.contracts.judge-d.baseUrl}") String baseUrl) {
+    JudgeDPublisher judgeDEnvironmentPublisher(Feign feign, @Value("${hltech.contracts.judge-d.baseUrl}") String baseUrl) {
         return feign.newInstance(new Target.HardCodedTarget<>(JudgeDPublisher.class, baseUrl));
     }
 
     @Bean
-    public Feign feign(ObjectFactory<HttpMessageConverters> messageConverters, ObjectMapper objectMapper) throws KeyManagementException, NoSuchAlgorithmException {
+    Feign feign(ObjectFactory<HttpMessageConverters> messageConverters, ObjectMapper objectMapper) throws KeyManagementException, NoSuchAlgorithmException {
         SSLContext ctx = SSLContext.getInstance("TLS");
         ctx.init(null, new TrustManager[]{new TrustAllX509TrustManager()}, null);
         SSLSocketFactory trustingSSLSocketFactory = ctx.getSocketFactory();
@@ -81,5 +81,4 @@ public X509Certificate[] getAcceptedIssuers() {
             return null;
         }
     }
-
 }
diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/config/CachingDelegatingDPublisher.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/config/CachingDelegatingDPublisher.java
@@ -1,23 +1,21 @@
 package com.hltech.judged.agent.config;
 
 import com.hltech.judged.agent.JudgeDPublisher;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashSet;
 import java.util.Set;
 
 @Slf4j
-public class CachingDelegatingDPublisher {
+@RequiredArgsConstructor
+class CachingDelegatingDPublisher {
 
     private final JudgeDPublisher judgeDPublisher;
 
     private Set<JudgeDPublisher.ServiceForm> previouslySentEnvironment;
 
-    public CachingDelegatingDPublisher(JudgeDPublisher judgeDPublisher) {
-        this.judgeDPublisher = judgeDPublisher;
-    }
-
-    public void publish(String environment, String space, Set<JudgeDPublisher.ServiceForm> serviceForms) {
+    void publish(String environment, String space, Set<JudgeDPublisher.ServiceForm> serviceForms) {
         if (previouslySentEnvironment == null || !previouslySentEnvironment.equals(serviceForms)) {
             log.info("publishing services to Judge-D: " + serviceForms);
 

diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/consul/ConsulBeanFactory.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/consul/ConsulBeanFactory.java
@@ -13,7 +13,7 @@
 @Configuration
 @Profile("consul")
 @RequiredArgsConstructor
-public class ConsulBeanFactory {
+class ConsulBeanFactory {
 
     @Value("${hltech.contracts.judge-d.consul-host}")
     private String consulUrl;

diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/consul/ConsulTagBasedServiceLocator.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/consul/ConsulTagBasedServiceLocator.java
@@ -11,9 +11,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-
 @RequiredArgsConstructor
-public class ConsulTagBasedServiceLocator implements ServiceLocator {
+class ConsulTagBasedServiceLocator implements ServiceLocator {
 
     private static final String VERSION_TAG_PREFIX = "version=";
     private static final String TAG_SEPARATOR = "=";

diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/k8s/K8sBeanFactory.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/k8s/K8sBeanFactory.java
@@ -12,15 +12,15 @@
 
 @Configuration
 @Profile("kubernetes")
-public class K8sBeanFactory {
+class K8sBeanFactory {
 
     @Bean
-    public KubernetesClient kubernetesClient() {
+    KubernetesClient kubernetesClient() {
         return new DefaultKubernetesClient();
     }
 
     @Bean
-    public ServiceLocator serviceLocator(
+    ServiceLocator serviceLocator(
         KubernetesClient kubernetesClient,
         @Value("${hltech.contracts.judge-d.requiredLabel}") String requiredLabel,
         @Value("${hltech.contracts.judge-d.excluded-namespaces:#{''}}") Set<String> excludedNamespaces,

diff --git a/judge-d-agent/src/main/java/com/hltech/judged/agent/k8s/K8sLabelBasedServiceLocator.java b/judge-d-agent/src/main/java/com/hltech/judged/agent/k8s/K8sLabelBasedServiceLocator.java
@@ -14,7 +14,7 @@
 
 import static java.util.stream.Collectors.toList;
 
-public class K8sLabelBasedServiceLocator implements ServiceLocator {
+class K8sLabelBasedServiceLocator implements ServiceLocator {
 
     private static final String EXCLUDE_FROM_JURISDICTION_LABEL = "exclude-from-judged-jurisdiction";
 
@@ -23,7 +23,7 @@ public class K8sLabelBasedServiceLocator implements ServiceLocator {
     private final Predicate<Namespace> excludedNamespacesFilter;
     private final Predicate<Namespace> includedNamespacesFilter;
 
-    public K8sLabelBasedServiceLocator(
+    K8sLabelBasedServiceLocator(
         KubernetesClient kubernetesClient,
         String requiredLabel,
         Set<String> excludedNamespaces,