Style formatting (#311)

microsoft · Mar 2, 2023 · 8a9f4d6 · 8a9f4d6
1 parent 1bd3b42
commit 8a9f4d6
Show file tree

Hide file tree

Showing 58 changed files with 906 additions and 488 deletions.
diff --git a/center/deploy_startup/alert_notification.html b/center/deploy_startup/alert_notification.html
diff --git a/center/deploy_startup/prometheus.yml b/center/deploy_startup/prometheus.yml
@@ -13,22 +13,22 @@ alerting:
 
 # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
 rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
+# - "first_rules.yml"
+# - "second_rules.yml"
 
 # A scrape configuration containing exactly one endpoint to scrape:
 # Here it's Prometheus itself.
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus-pushgateway'   
+  - job_name: 'prometheus-pushgateway'
     # metrics_path defaults to '/metrics'
     # scheme defaults to 'http'.
     scrape_interval: 10s
-    scrape_timeout: 5s    
+    scrape_timeout: 5s
     # metrics_path: /actuator/prometheus
     scheme: http
     basic_auth:
       username: admin
       password: env:PUSHGATEWAY_PASSWORD
     static_configs:
-      - targets: ["localhost:9091"]
+      - targets: [ "localhost:9091" ]
diff --git a/center/src/main/java/com/microsoft/hydralab/center/RegisterCenterApplication.java b/center/src/main/java/com/microsoft/hydralab/center/RegisterCenterApplication.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center;
 
 import org.springframework.boot.SpringApplication;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/AADOauth2Configuration.java b/center/src/main/java/com/microsoft/hydralab/center/config/AADOauth2Configuration.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.springframework.context.annotation.Configuration;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/AppConfig.java b/center/src/main/java/com/microsoft/hydralab/center/config/AppConfig.java
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.microsoft.hydralab.common.monitor.MetricPushGateway;
 import com.microsoft.hydralab.common.entity.center.BlobProperty;
+import com.microsoft.hydralab.common.monitor.MetricPushGateway;
 import com.microsoft.hydralab.common.util.blob.BlobStorageClient;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.exporter.BasicAuthHttpConnectionFactory;
@@ -72,11 +73,10 @@ public HttpSessionEventPublisher eventPublisher() {
     @ConditionalOnProperty(prefix = "management.metrics.export.prometheus.pushgateway", name = "enabled", havingValue = "true")
     public PushGateway pushGateway(PrometheusProperties prometheusProperties) throws MalformedURLException {
         String baseUrl = prometheusProperties.getPushgateway().getBaseUrl();
-        if (!baseUrl.startsWith("http")){
+        if (!baseUrl.startsWith("http")) {
             if (baseUrl.startsWith("127.0.0.1") || baseUrl.startsWith("localhost")) {
                 baseUrl = "http://" + baseUrl;
-            }
-            else {
+            } else {
                 baseUrl = "https://" + baseUrl;
             }
         }

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/ContextStartup.java b/center/src/main/java/com/microsoft/hydralab/center/config/ContextStartup.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 
@@ -23,11 +24,11 @@
 @Slf4j
 public class ContextStartup implements ApplicationRunner, ServletContextAware {
 
-    private ServletContext servletContext;
     @Resource
     MetricUtil metricUtil;
     @Resource
     DeviceAgentManagementService deviceAgentManagementService;
+    private ServletContext servletContext;
 
     @Override
     public void run(ApplicationArguments applicationArguments) {

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/RestTemplateConfig.java b/center/src/main/java/com/microsoft/hydralab/center/config/RestTemplateConfig.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
@@ -23,22 +24,8 @@
 @Configuration
 public class RestTemplateConfig {
 
-    @Bean
-    public RestTemplate restTemplate(ClientHttpRequestFactory factory){
-        return new RestTemplate(factory);
-    }
-
-    @Bean
-    public ClientHttpRequestFactory simpleClientHttpRequestFactory(){
-        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
-        factory.setConnectTimeout(15000);
-        factory.setReadTimeout(5000);
-        return factory;
-    }
-
     public static HttpComponentsClientHttpRequestFactory generateHttpRequestFactory()
-            throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException
-    {
+            throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
         TrustStrategy acceptingTrustStrategy = (x509Certificates, authType) -> true;
         SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
         SSLConnectionSocketFactory connectionSocketFactory = new SSLConnectionSocketFactory(sslContext, new NoopHostnameVerifier());
@@ -50,4 +37,17 @@ public static HttpComponentsClientHttpRequestFactory generateHttpRequestFactory(
         factory.setHttpClient(httpClient);
         return factory;
     }
+
+    @Bean
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory) {
+        return new RestTemplate(factory);
+    }
+
+    @Bean
+    public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+        factory.setConnectTimeout(15000);
+        factory.setReadTimeout(5000);
+        return factory;
+    }
 }
diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/SecurityConfiguration.java b/center/src/main/java/com/microsoft/hydralab/center/config/SecurityConfiguration.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.springframework.context.annotation.Bean;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/SpringApplicationListener.java b/center/src/main/java/com/microsoft/hydralab/center/config/SpringApplicationListener.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.jetbrains.annotations.NotNull;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/SwaggerConfig.java b/center/src/main/java/com/microsoft/hydralab/center/config/SwaggerConfig.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.springframework.beans.factory.annotation.Value;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/WebMvcConfiguration.java b/center/src/main/java/com/microsoft/hydralab/center/config/WebMvcConfiguration.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
@@ -30,7 +31,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/portal/").setViewName("forward:"+ Const.FrontEndPath.INDEX_PATH);
+        registry.addViewController("/portal/").setViewName("forward:" + Const.FrontEndPath.INDEX_PATH);
     }
 
     @Override

diff --git a/center/src/main/java/com/microsoft/hydralab/center/config/WebSocketConfig.java b/center/src/main/java/com/microsoft/hydralab/center/config/WebSocketConfig.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.config;
 
 import org.springframework.context.annotation.Bean;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/controller/AgentManageController.java b/center/src/main/java/com/microsoft/hydralab/center/controller/AgentManageController.java
@@ -1,15 +1,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.microsoft.hydralab.center.service.*;
+import com.microsoft.hydralab.center.service.AgentManageService;
+import com.microsoft.hydralab.center.service.DeviceAgentManagementService;
+import com.microsoft.hydralab.center.service.SysTeamService;
+import com.microsoft.hydralab.center.service.SysUserService;
+import com.microsoft.hydralab.center.service.UserTeamManagementService;
 import com.microsoft.hydralab.common.entity.agent.Result;
-import com.microsoft.hydralab.common.entity.common.AgentUser;
 import com.microsoft.hydralab.common.entity.center.SysTeam;
 import com.microsoft.hydralab.common.entity.center.SysUser;
 import com.microsoft.hydralab.common.entity.common.AgentUpdateTask;
+import com.microsoft.hydralab.common.entity.common.AgentUser;
 import com.microsoft.hydralab.common.entity.common.CriteriaType;
 import com.microsoft.hydralab.common.util.AttachmentService;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +25,12 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.CurrentSecurityContext;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/controller/AuthController.java b/center/src/main/java/com/microsoft/hydralab/center/controller/AuthController.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.controller;
 
 import com.microsoft.hydralab.center.service.AuthTokenService;
@@ -17,7 +18,12 @@
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.CurrentSecurityContext;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/controller/DeviceGroupController.java b/center/src/main/java/com/microsoft/hydralab/center/controller/DeviceGroupController.java
@@ -1,9 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.controller;
 
 import com.azure.core.annotation.QueryParam;
-import com.microsoft.hydralab.center.service.*;
+import com.microsoft.hydralab.center.service.DeviceAgentManagementService;
+import com.microsoft.hydralab.center.service.DeviceGroupService;
+import com.microsoft.hydralab.center.service.SysTeamService;
+import com.microsoft.hydralab.center.service.SysUserService;
+import com.microsoft.hydralab.center.service.UserTeamManagementService;
 import com.microsoft.hydralab.common.entity.agent.Result;
 import com.microsoft.hydralab.common.entity.center.DeviceGroup;
 import com.microsoft.hydralab.common.entity.center.DeviceGroupRelation;
@@ -16,7 +21,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.CurrentSecurityContext;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;

diff --git a/center/src/main/java/com/microsoft/hydralab/center/controller/DeviceManageController.java b/center/src/main/java/com/microsoft/hydralab/center/controller/DeviceManageController.java
@@ -1,18 +1,19 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 package com.microsoft.hydralab.center.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.microsoft.hydralab.center.service.AgentManageService;
 import com.microsoft.hydralab.center.service.DeviceAgentManagementService;
-import com.microsoft.hydralab.common.util.Const;
 import com.microsoft.hydralab.center.service.SysUserService;
 import com.microsoft.hydralab.center.service.UserTeamManagementService;
 import com.microsoft.hydralab.common.entity.agent.Result;
 import com.microsoft.hydralab.common.entity.center.AgentDeviceGroup;
 import com.microsoft.hydralab.common.entity.center.DeviceGroup;
 import com.microsoft.hydralab.common.entity.center.SysUser;
 import com.microsoft.hydralab.common.entity.common.DeviceInfo;
+import com.microsoft.hydralab.common.util.Const;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,7 +29,6 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @RestController
 @Slf4j