diff --git a/pom.xml b/pom.xml index 3b480fb..2405efb 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,24 @@ + + net.revelc.code.formatter + formatter-maven-plugin + 2.29.0 + + https://git.dinauer.dev/andreas.dinauer/formatter/raw/branch/main/format.xml + LF + UTF-8 + + + + validate + + validate + + + + net.revelc.code impsort-maven-plugin diff --git a/src/main/java/dev/dinauer/IngressResource.java b/src/main/java/dev/dinauer/IngressResource.java index 3f4c163..ae054c9 100644 --- a/src/main/java/dev/dinauer/IngressResource.java +++ b/src/main/java/dev/dinauer/IngressResource.java @@ -27,7 +27,7 @@ public class IngressResource @Produces(MediaType.APPLICATION_JSON) public List getIngresses(@QueryParam("namespace") String namespace) { - if(namespace != null) + if (namespace != null) { ingressService.findByNamespace(namespace); } diff --git a/src/main/java/dev/dinauer/ProcessRunner.java b/src/main/java/dev/dinauer/ProcessRunner.java index f0e0c54..a8f3c4d 100644 --- a/src/main/java/dev/dinauer/ProcessRunner.java +++ b/src/main/java/dev/dinauer/ProcessRunner.java @@ -47,10 +47,10 @@ public class ProcessRunner List text = new ArrayList<>(); Process process = processBuilder.start(); executor.submit(() -> { - try(BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))) + try (BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()))) { String line; - while((line = br.readLine()) != null) + while ((line = br.readLine()) != null) { text.add(line); } @@ -65,7 +65,7 @@ public class ProcessRunner process.destroyForcibly(); if (endedInTime) { - if(exitCode == 0) + if (exitCode == 0) { return text; } diff --git a/src/main/java/dev/dinauer/ResourceResource.java b/src/main/java/dev/dinauer/ResourceResource.java index f496904..5236182 100644 --- a/src/main/java/dev/dinauer/ResourceResource.java +++ b/src/main/java/dev/dinauer/ResourceResource.java @@ -86,7 +86,7 @@ public class ResourceResource { if (ResourceType.DEPLOYMENT.equals(resourceType)) { - if(namespace != null && !namespace.isBlank() && name != null && !name.isBlank() && replicaCount != null && replicaCount > 0) + if (namespace != null && !namespace.isBlank() && name != null && !name.isBlank() && replicaCount != null && replicaCount > 0) { deploymentService.rescale(namespace, name, replicaCount); } @@ -101,44 +101,34 @@ public class ResourceResource { switch (resourceType) { - case ResourceType.STATEFUL_SET -> - { + case ResourceType.STATEFUL_SET -> { return statefulSetService; } - case ResourceType.DEPLOYMENT -> - { + case ResourceType.DEPLOYMENT -> { return deploymentService; } - case ResourceType.SERVICE -> - { + case ResourceType.SERVICE -> { return serviceService; } - case ResourceType.INGRESS -> - { + case ResourceType.INGRESS -> { return ingressService; } - case ResourceType.POD -> - { + case ResourceType.POD -> { return podService; } - case ResourceType.CUSTOM_RESOURCE_DEFINITION -> - { + case ResourceType.CUSTOM_RESOURCE_DEFINITION -> { return customResourceDefinitionService; } - case ResourceType.NODE -> - { + case ResourceType.NODE -> { return nodeService; } - case ResourceType.SECRET -> - { + case ResourceType.SECRET -> { return secretService; } - case ResourceType.CONFIG_MAP -> - { + case ResourceType.CONFIG_MAP -> { return configMapService; } - default -> - { + default -> { LOG.errorf("Invalid resource type %s.", resourceType); throw new BadRequestException(); } diff --git a/src/main/java/dev/dinauer/ResourceType.java b/src/main/java/dev/dinauer/ResourceType.java index 10953d6..d33850d 100644 --- a/src/main/java/dev/dinauer/ResourceType.java +++ b/src/main/java/dev/dinauer/ResourceType.java @@ -3,36 +3,33 @@ package dev.dinauer; public enum ResourceType { // Cluster Resources - NODE("nodes"), - NAMESPACE("namespaces"), - CUSTOM_RESOURCE_DEFINITION("custom-resource-definitions"), + NODE("nodes"), NAMESPACE("namespaces"), CUSTOM_RESOURCE_DEFINITION("custom-resource-definitions"), // Workloads - STATEFUL_SET("stateful-sets"), - DEPLOYMENT("deployments"), - POD("pods"), + STATEFUL_SET("stateful-sets"), DEPLOYMENT("deployments"), POD("pods"), // Networking - SERVICE("services"), - INGRESS("ingresses"), + SERVICE("services"), INGRESS("ingresses"), // Config - SECRET("secrets"), - CONFIG_MAP("config-maps"), + SECRET("secrets"), CONFIG_MAP("config-maps"), // Storage - PVC("pvcs"), - PV("pvs"); + PVC("pvcs"), PV("pvs"); private final String value; - ResourceType(String value) { + ResourceType(String value) + { this.value = value; } - public static ResourceType fromString(String text) { - for (ResourceType type : ResourceType.values()) { - if (type.value.equalsIgnoreCase(text)) { + public static ResourceType fromString(String text) + { + for (ResourceType type : ResourceType.values()) + { + if (type.value.equalsIgnoreCase(text)) + { return type; } } @@ -40,7 +37,8 @@ public enum ResourceType } @Override - public String toString() { + public String toString() + { return value; } } \ No newline at end of file diff --git a/src/main/java/dev/dinauer/ServiceResource.java b/src/main/java/dev/dinauer/ServiceResource.java index 565cb8f..3e7dc83 100644 --- a/src/main/java/dev/dinauer/ServiceResource.java +++ b/src/main/java/dev/dinauer/ServiceResource.java @@ -31,7 +31,7 @@ public class ServiceResource @Produces(MediaType.APPLICATION_JSON) public List getServices(@QueryParam("namespace") String namespace) { - if(namespace != null && !namespace.isBlank()) + if (namespace != null && !namespace.isBlank()) { return serviceService.findByNamespace(namespace); } diff --git a/src/main/java/dev/dinauer/inspect/log/LogWebsocket.java b/src/main/java/dev/dinauer/inspect/log/LogWebsocket.java index c0608d1..65760ee 100644 --- a/src/main/java/dev/dinauer/inspect/log/LogWebsocket.java +++ b/src/main/java/dev/dinauer/inspect/log/LogWebsocket.java @@ -52,7 +52,7 @@ public class LogWebsocket LogWatch watch = clientProvider.getClient().pods().inNamespace(namespace).withName(name).usingTimestamps().tailingLines(0).watchLog(); sessions.put(session, watch); - try(BufferedReader reader = new BufferedReader(new InputStreamReader(watch.getOutput()))) + try (BufferedReader reader = new BufferedReader(new InputStreamReader(watch.getOutput()))) { String line; while ((line = reader.readLine()) != null && !Thread.currentThread().isInterrupted()) diff --git a/src/main/java/dev/dinauer/inspect/websocket/ResourceWebsocket.java b/src/main/java/dev/dinauer/inspect/websocket/ResourceWebsocket.java index d7a9ba3..f6faee8 100644 --- a/src/main/java/dev/dinauer/inspect/websocket/ResourceWebsocket.java +++ b/src/main/java/dev/dinauer/inspect/websocket/ResourceWebsocket.java @@ -49,8 +49,7 @@ public class ResourceWebsocket ResourceType resourceType = ResourceType.fromString(rawResourceType); if (tokenService.validateTokenByQueryString(session.getQueryString())) { - executor.submit(() -> - { + executor.submit(() -> { ResourceService service = serviceFactory.getService(resourceType); send(session, EventType.INIT, service.findByNamespace(namespace)); sessions.put(session, service.watch(namespace, getWatcher(session))); diff --git a/src/main/java/dev/dinauer/inspect/websocket/ServiceFactory.java b/src/main/java/dev/dinauer/inspect/websocket/ServiceFactory.java index 45fa50b..fc651a6 100644 --- a/src/main/java/dev/dinauer/inspect/websocket/ServiceFactory.java +++ b/src/main/java/dev/dinauer/inspect/websocket/ServiceFactory.java @@ -55,55 +55,55 @@ public class ServiceFactory { switch (resourceType) { - case ResourceType.STATEFUL_SET -> + case ResourceType.STATEFUL_SET: { return statefulSetService; } - case ResourceType.DEPLOYMENT -> + case ResourceType.DEPLOYMENT: { return deploymentService; } - case ResourceType.SERVICE -> + case ResourceType.SERVICE: { return serviceService; } - case ResourceType.INGRESS -> + case ResourceType.INGRESS: { return ingressService; } - case ResourceType.POD -> + case ResourceType.POD: { return podService; } - case ResourceType.CUSTOM_RESOURCE_DEFINITION -> + case ResourceType.CUSTOM_RESOURCE_DEFINITION: { return customResourceDefinitionService; } - case ResourceType.NODE -> + case ResourceType.NODE: { return nodeService; } - case ResourceType.SECRET -> + case ResourceType.SECRET: { return secretService; } - case ResourceType.CONFIG_MAP -> + case ResourceType.CONFIG_MAP: { return configMapService; } - case ResourceType.PVC -> + case ResourceType.PVC: { return pvcService; } - case ResourceType.PV -> + case ResourceType.PV: { return pvService; } - case ResourceType.NAMESPACE -> + case ResourceType.NAMESPACE: { return namespaceService; } - default -> + default : { LOG.errorf("Invalid resource type %s.", resourceType); throw new BadRequestException(); diff --git a/src/main/java/dev/dinauer/login/LoginResource.java b/src/main/java/dev/dinauer/login/LoginResource.java index f0faabe..36ba602 100644 --- a/src/main/java/dev/dinauer/login/LoginResource.java +++ b/src/main/java/dev/dinauer/login/LoginResource.java @@ -30,16 +30,12 @@ public class LoginResource public String login(Login login) { Optional userOptional = userRepo.findOptionalByUsername(login.username()); - if(userOptional.isPresent()) + if (userOptional.isPresent()) { UserEntity user = userOptional.get(); - if(BcryptUtil.matches(login.password(), user.getPassword())) + if (BcryptUtil.matches(login.password(), user.getPassword())) { - return Jwt - .upn(user.getId()) - .expiresAt(ZonedDateTime.now().plusDays(15).toInstant()) - .groups(user.getRoles()) - .sign(); + return Jwt.upn(user.getId()).expiresAt(ZonedDateTime.now().plusDays(15).toInstant()).groups(user.getRoles()).sign(); } LOG.info("Cannot access user. Forbidden"); throw new ForbiddenException(Response.status(403).type(MediaType.TEXT_PLAIN).entity("wrong_password").build()); diff --git a/src/main/java/dev/dinauer/login/UserResource.java b/src/main/java/dev/dinauer/login/UserResource.java index 465bc77..13a1ef2 100644 --- a/src/main/java/dev/dinauer/login/UserResource.java +++ b/src/main/java/dev/dinauer/login/UserResource.java @@ -52,7 +52,8 @@ public class UserResource @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) @Transactional - @RolesAllowed({"ADMIN", "OWNER"}) + @RolesAllowed( + {"ADMIN", "OWNER"}) public void createUser(UserCreation user) { if (List.of("ADMIN", "USER").contains(user.role())) @@ -78,10 +79,10 @@ public class UserResource public void changePassword(@PathParam("username") String username, String password) { Optional persistentUserOptional = userRepo.findOptionalByUsername(username); - if(persistentUserOptional.isPresent() && password != null && !password.isBlank()) + if (persistentUserOptional.isPresent() && password != null && !password.isBlank()) { UserEntity persistentUser = persistentUserOptional.get(); - if(securityIdentity.getPrincipal().getName().equals(persistentUser.getId())) + if (securityIdentity.getPrincipal().getName().equals(persistentUser.getId())) { persistentUser.setPassword(BcryptUtil.bcryptHash(password)); userRepo.persist(persistentUser); diff --git a/src/main/java/dev/dinauer/monitoring/MonitoringJobRunner.java b/src/main/java/dev/dinauer/monitoring/MonitoringJobRunner.java index e7cbb20..1be029c 100644 --- a/src/main/java/dev/dinauer/monitoring/MonitoringJobRunner.java +++ b/src/main/java/dev/dinauer/monitoring/MonitoringJobRunner.java @@ -91,14 +91,17 @@ public class MonitoringJobRunner LOG.infof("Running %s %s monitoring.", config.getConfigName(), config.getType().toString().toLowerCase()); switch (config.getType()) { - case VOLUME -> + case VOLUME: { volumeMonitoringJobRunner.run(config); + return; } - case WORKLOAD -> + case WORKLOAD: { memoryMonitoringJobRunner.run(config); + return; } } + throw new RuntimeException(); } } diff --git a/src/main/java/dev/dinauer/monitoring/MonitoringResource.java b/src/main/java/dev/dinauer/monitoring/MonitoringResource.java index 3be86ad..f410031 100644 --- a/src/main/java/dev/dinauer/monitoring/MonitoringResource.java +++ b/src/main/java/dev/dinauer/monitoring/MonitoringResource.java @@ -55,7 +55,7 @@ public class MonitoringResource switch (configCreation.type()) { - case MonitoringType.VOLUME -> + case MonitoringType.VOLUME: { VolumeConfig volumeConfig = new VolumeConfig(); volumeConfig.setId(UUID.randomUUID().toString()); diff --git a/src/main/java/dev/dinauer/monitoring/MonitoringService.java b/src/main/java/dev/dinauer/monitoring/MonitoringService.java index af0f68e..4bffa96 100644 --- a/src/main/java/dev/dinauer/monitoring/MonitoringService.java +++ b/src/main/java/dev/dinauer/monitoring/MonitoringService.java @@ -24,12 +24,10 @@ public class MonitoringService TargetConfig targetConfig = config.getTargetConfig(); switch (targetConfig.getType()) { - case LABEL -> - { + case LABEL -> { return podService.findByNamespaceAndLabels(targetConfig.getNamespace(), targetConfig.getLabels()).stream().filter(pod -> pod.getStatus().getPhase().equals("Running")).toList(); } - case DEPLOYMENT, STATEFUL_SET -> - { + case DEPLOYMENT, STATEFUL_SET -> { throw new NotImplementedYet(); } } diff --git a/src/main/java/dev/dinauer/monitoring/TopNodesService.java b/src/main/java/dev/dinauer/monitoring/TopNodesService.java index 3dd0daf..041a6e8 100644 --- a/src/main/java/dev/dinauer/monitoring/TopNodesService.java +++ b/src/main/java/dev/dinauer/monitoring/TopNodesService.java @@ -38,10 +38,10 @@ public class TopNodesService List stats = runTopNodesCommand(); Map podsOnNodes = countPods(); Map nodeDiskMetrics = nodeDiskService.getDiskMetrics(); - for(String nodeName : stats) + for (String nodeName : stats) { String[] parts = nodeName.split("\\s+"); - if(parts.length == 5) + if (parts.length == 5) { String name = parts[0]; Node node = clientProvider.getClient().nodes().withName(name).get(); @@ -92,15 +92,15 @@ public class TopNodesService private Integer extractMemory(String input) { - if(input.contains("Ki")) + if (input.contains("Ki")) { return Integer.parseInt(input.replace("Ki", "")); } - if(input.contains("Mi")) + if (input.contains("Mi")) { return Integer.parseInt(input.replace("Mi", "")) * 1024; } - if(input.contains("Gi")) + if (input.contains("Gi")) { return Integer.parseInt(input.replace("Gi", "")) * 1024 * 1024; } diff --git a/src/main/java/dev/dinauer/monitoring/entity/MonitoringTargetType.java b/src/main/java/dev/dinauer/monitoring/entity/MonitoringTargetType.java index 282a5d9..5d7e3c0 100644 --- a/src/main/java/dev/dinauer/monitoring/entity/MonitoringTargetType.java +++ b/src/main/java/dev/dinauer/monitoring/entity/MonitoringTargetType.java @@ -2,7 +2,5 @@ package dev.dinauer.monitoring.entity; public enum MonitoringTargetType { - DEPLOYMENT, - STATEFUL_SET, - LABEL + DEPLOYMENT, STATEFUL_SET, LABEL } diff --git a/src/main/java/dev/dinauer/monitoring/entity/TargetConfig.java b/src/main/java/dev/dinauer/monitoring/entity/TargetConfig.java index dcdec77..4e68ce9 100644 --- a/src/main/java/dev/dinauer/monitoring/entity/TargetConfig.java +++ b/src/main/java/dev/dinauer/monitoring/entity/TargetConfig.java @@ -97,7 +97,9 @@ public class TargetConfig { try { - return OBJECT_MAPPER.readValue(labels, new TypeReference>() {}); + return OBJECT_MAPPER.readValue(labels, new TypeReference>() + { + }); } catch (JsonProcessingException e) { diff --git a/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringConfigCreation.java b/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringConfigCreation.java index 674c4db..84f01f0 100644 --- a/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringConfigCreation.java +++ b/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringConfigCreation.java @@ -2,10 +2,6 @@ package dev.dinauer.monitoring.entity.creation; import dev.dinauer.monitoring.entity.MonitoringType; -public record MonitoringConfigCreation( - String configName, - MonitoringType type, - String interval, - VolumeConfigCreation volumeConfig, - MonitoringTargetConfigCreation targetConfig -) {} \ No newline at end of file +public record MonitoringConfigCreation(String configName, MonitoringType type, String interval, VolumeConfigCreation volumeConfig, MonitoringTargetConfigCreation targetConfig) +{ +} \ No newline at end of file diff --git a/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringTargetConfigCreation.java b/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringTargetConfigCreation.java index 664d751..1e2e380 100644 --- a/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringTargetConfigCreation.java +++ b/src/main/java/dev/dinauer/monitoring/entity/creation/MonitoringTargetConfigCreation.java @@ -2,11 +2,6 @@ package dev.dinauer.monitoring.entity.creation; import dev.dinauer.monitoring.entity.MonitoringTargetType; -public record MonitoringTargetConfigCreation( - MonitoringTargetType type, - String namespace, - String deploymentName, - String statefulSetName, - String labelKey, - String labelValue -) {} \ No newline at end of file +public record MonitoringTargetConfigCreation(MonitoringTargetType type, String namespace, String deploymentName, String statefulSetName, String labelKey, String labelValue) +{ +} \ No newline at end of file diff --git a/src/main/java/dev/dinauer/monitoring/entity/creation/VolumeConfigCreation.java b/src/main/java/dev/dinauer/monitoring/entity/creation/VolumeConfigCreation.java index bfd334f..54b64aa 100644 --- a/src/main/java/dev/dinauer/monitoring/entity/creation/VolumeConfigCreation.java +++ b/src/main/java/dev/dinauer/monitoring/entity/creation/VolumeConfigCreation.java @@ -1,6 +1,5 @@ package dev.dinauer.monitoring.entity.creation; -public record VolumeConfigCreation( - String mountPath, - String containerName -) {} +public record VolumeConfigCreation(String mountPath, String containerName) +{ +} diff --git a/src/main/java/dev/dinauer/monitoring/nodes/NodeMonitoringService.java b/src/main/java/dev/dinauer/monitoring/nodes/NodeMonitoringService.java index e6df61c..7549ba6 100644 --- a/src/main/java/dev/dinauer/monitoring/nodes/NodeMonitoringService.java +++ b/src/main/java/dev/dinauer/monitoring/nodes/NodeMonitoringService.java @@ -28,15 +28,7 @@ public class NodeMonitoringService for (MonitoredNode node : nodes) { NodeMetrics nodeMetrics = node.getMetrics(); - Map metrics = Stream.of( - new AbstractMap.SimpleEntry<>("RELATIVE_CPU", nodeMetrics.relativeCpuUsage()), - new AbstractMap.SimpleEntry<>("RELATIVE_MEMORY", nodeMetrics.relativeMemory()), - new AbstractMap.SimpleEntry<>("ABSOLUTE_MEMORY", nodeMetrics.absoluteMemory()), - new AbstractMap.SimpleEntry<>("ABSOLUTE_CPU", nodeMetrics.absoluteCpuUsage()), - new AbstractMap.SimpleEntry<>("RELATIVE_DISK_SPACE", nodeMetrics.relativeDiskUsage()), - new AbstractMap.SimpleEntry<>("TOTAL_DISK_SPACE", nodeMetrics.totalDiskSpace())) - .filter(entry -> entry.getValue() != null) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + Map metrics = Stream.of(new AbstractMap.SimpleEntry<>("RELATIVE_CPU", nodeMetrics.relativeCpuUsage()), new AbstractMap.SimpleEntry<>("RELATIVE_MEMORY", nodeMetrics.relativeMemory()), new AbstractMap.SimpleEntry<>("ABSOLUTE_MEMORY", nodeMetrics.absoluteMemory()), new AbstractMap.SimpleEntry<>("ABSOLUTE_CPU", nodeMetrics.absoluteCpuUsage()), new AbstractMap.SimpleEntry<>("RELATIVE_DISK_SPACE", nodeMetrics.relativeDiskUsage()), new AbstractMap.SimpleEntry<>("TOTAL_DISK_SPACE", nodeMetrics.totalDiskSpace())).filter(entry -> entry.getValue() != null).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); bigBucketService.index(String.format("NODE-%s", node.getMetadata().getUid()), "NODE_METRICS", metrics); } diff --git a/src/main/java/dev/dinauer/monitoring/volume/utils/Duration.java b/src/main/java/dev/dinauer/monitoring/volume/utils/Duration.java index 166abe9..ac33a36 100644 --- a/src/main/java/dev/dinauer/monitoring/volume/utils/Duration.java +++ b/src/main/java/dev/dinauer/monitoring/volume/utils/Duration.java @@ -10,20 +10,16 @@ public class Duration long value = Long.parseLong(input.substring(0, input.length() - 1)); switch (unit) { - case 's' -> - { + case 's' -> { return value; } - case 'm' -> - { + case 'm' -> { return value * 60; } - case 'h' -> - { + case 'h' -> { return value * 60 * 60; } - default -> - { + default -> { throw new IllegalArgumentException(String.format("Invalid unit %s", unit)); } } diff --git a/src/main/java/dev/dinauer/service/DeploymentService.java b/src/main/java/dev/dinauer/service/DeploymentService.java index 6dfca82..aaa5074 100644 --- a/src/main/java/dev/dinauer/service/DeploymentService.java +++ b/src/main/java/dev/dinauer/service/DeploymentService.java @@ -36,7 +36,7 @@ public class DeploymentService implements ResourceService @Override public List findByNamespace(String namespace) { - try(AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { if (namespace.equals("_all")) { @@ -48,7 +48,7 @@ public class DeploymentService implements ResourceService public List findAll() { - try(AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { return dsl.deployments().inAnyNamespace().list().getItems(); } @@ -63,7 +63,8 @@ public class DeploymentService implements ResourceService @Override public Watch watch(String namespace, Watcher watcher) { - try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + { String version = dsl.deployments().inAnyNamespace().list().getMetadata().getResourceVersion(); if (namespace.equals("_all")) { @@ -75,7 +76,7 @@ public class DeploymentService implements ResourceService public void rescale(String namespace, String name, int replicaCount) { - try(AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { dsl.deployments().inNamespace(namespace).withName(name).scale(replicaCount); } diff --git a/src/main/java/dev/dinauer/service/IngressService.java b/src/main/java/dev/dinauer/service/IngressService.java index 663bd61..1c96cbd 100644 --- a/src/main/java/dev/dinauer/service/IngressService.java +++ b/src/main/java/dev/dinauer/service/IngressService.java @@ -31,7 +31,7 @@ public class IngressService implements ResourceService @Override public Ingress findByNameAndNamespace(String name, String namespace) { - try(NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) + try (NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) { List ingresses = dsl.v1().ingresses().list().getItems(); for (Ingress ingress : ingresses) @@ -48,7 +48,7 @@ public class IngressService implements ResourceService public List findByNamespace(String namespace) { - try(NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) + try (NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) { if (namespace.equals("_all")) { @@ -60,7 +60,7 @@ public class IngressService implements ResourceService public List findAll() { - try(NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) + try (NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) { return dsl.v1().ingresses().inAnyNamespace().list().getItems(); } @@ -75,7 +75,7 @@ public class IngressService implements ResourceService @Override public Watch watch(String namespace, Watcher watcher) { - try(NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) + try (NetworkAPIGroupDSL dsl = clientProvider.getClient().network()) { String version = dsl.v1().ingresses().inAnyNamespace().list().getMetadata().getResourceVersion(); if (namespace.equals("_all")) diff --git a/src/main/java/dev/dinauer/service/PodService.java b/src/main/java/dev/dinauer/service/PodService.java index 0d50b8d..ff14d71 100644 --- a/src/main/java/dev/dinauer/service/PodService.java +++ b/src/main/java/dev/dinauer/service/PodService.java @@ -25,14 +25,10 @@ public class PodService implements ResourceService public void delete(String name, String namespace) { Optional podOptional = findOptionalByNameAndNamespace(name, namespace); - if(podOptional.isPresent()) + if (podOptional.isPresent()) { Pod pod = podOptional.get(); - clientProvider.getClient() - .pods() - .inNamespace(pod.getMetadata().getNamespace()) - .withName(pod.getMetadata().getName()) - .delete(); + clientProvider.getClient().pods().inNamespace(pod.getMetadata().getNamespace()).withName(pod.getMetadata().getName()).delete(); } } @@ -53,7 +49,7 @@ public class PodService implements ResourceService public List findByStatefulSet(String name, String namespace) { - try(AppsAPIGroupDSL apps = clientProvider.getClient().apps()) + try (AppsAPIGroupDSL apps = clientProvider.getClient().apps()) { StatefulSet set = apps.statefulSets().inNamespace(namespace).withName(name).get(); if (set != null) @@ -98,9 +94,9 @@ public class PodService implements ResourceService public Optional findPodById(String id) { - for(Pod pod : clientProvider.getClient().pods().inAnyNamespace().list().getItems()) + for (Pod pod : clientProvider.getClient().pods().inAnyNamespace().list().getItems()) { - if(pod.getMetadata().getUid().equals(id)) + if (pod.getMetadata().getUid().equals(id)) { return Optional.of(pod); } diff --git a/src/main/java/dev/dinauer/service/ServiceService.java b/src/main/java/dev/dinauer/service/ServiceService.java index e822163..b4bfdcb 100644 --- a/src/main/java/dev/dinauer/service/ServiceService.java +++ b/src/main/java/dev/dinauer/service/ServiceService.java @@ -65,9 +65,9 @@ public class ServiceService implements ResourceService public Optional findById(String id) { - for(Service service : clientProvider.getClient().services().list().getItems()) + for (Service service : clientProvider.getClient().services().list().getItems()) { - if(service.getMetadata().getUid().equals(id)) + if (service.getMetadata().getUid().equals(id)) { return Optional.of(service); } diff --git a/src/main/java/dev/dinauer/service/StatefulSetService.java b/src/main/java/dev/dinauer/service/StatefulSetService.java index da44833..e0e391a 100644 --- a/src/main/java/dev/dinauer/service/StatefulSetService.java +++ b/src/main/java/dev/dinauer/service/StatefulSetService.java @@ -37,7 +37,7 @@ public class StatefulSetService implements ResourceService @Override public List findByNamespace(String namespace) { - try(AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { if (namespace.equals("_all")) { @@ -62,7 +62,8 @@ public class StatefulSetService implements ResourceService @Override public Watch watch(String namespace, Watcher watcher) { - try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) { + try (AppsAPIGroupDSL dsl = clientProvider.getClient().apps()) + { String version = dsl.statefulSets().inAnyNamespace().list().getMetadata().getResourceVersion(); if (namespace.equals("_all")) { diff --git a/src/main/java/dev/dinauer/utils/StartupService.java b/src/main/java/dev/dinauer/utils/StartupService.java index 27d05e3..d130158 100644 --- a/src/main/java/dev/dinauer/utils/StartupService.java +++ b/src/main/java/dev/dinauer/utils/StartupService.java @@ -31,7 +31,7 @@ public class StartupService @PostConstruct public void init() { - if(userRepo.findOptionalByUsername(INITIAL_USERNAME).isEmpty()) + if (userRepo.findOptionalByUsername(INITIAL_USERNAME).isEmpty()) { QuarkusTransaction.begin(); userRepo.persist(buildInitialUser()); diff --git a/src/test/java/dev/dinauer/monitoring/memory/ByteExtractorTest.java b/src/test/java/dev/dinauer/monitoring/memory/ByteExtractorTest.java index d670eaf..3b3ef97 100644 --- a/src/test/java/dev/dinauer/monitoring/memory/ByteExtractorTest.java +++ b/src/test/java/dev/dinauer/monitoring/memory/ByteExtractorTest.java @@ -10,9 +10,9 @@ public class ByteExtractorTest void test() { String input = """ - NAME CPU(cores) MEMORY(bytes) - postgres-cluster-1 13m 50Mi - """; + NAME CPU(cores) MEMORY(bytes) + postgres-cluster-1 13m 50Mi + """; long bytes = ByteExtractor.extractBytes(input);