diff --git a/openbas-framework/src/main/java/io/openbas/asset/EndpointService.java b/openbas-framework/src/main/java/io/openbas/asset/EndpointService.java index 559a4c90bb..d57ac432dd 100644 --- a/openbas-framework/src/main/java/io/openbas/asset/EndpointService.java +++ b/openbas-framework/src/main/java/io/openbas/asset/EndpointService.java @@ -2,7 +2,6 @@ import io.openbas.config.OpenBASConfig; import io.openbas.database.model.Endpoint; -import io.openbas.database.raw.RawAsset; import io.openbas.database.repository.EndpointRepository; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotBlank; @@ -37,7 +36,8 @@ public class EndpointService { @Value("${openbas.admin.token:#{null}}") private String adminToken; - @Value("${info.app.version:unknown}") String version; + @Value("${info.app.version:unknown}") + String version; private final EndpointRepository endpointRepository; @@ -99,9 +99,9 @@ public String getFileOrDownloadFromJfrog(String platform, String file, String ad String extension = switch (platform.toLowerCase()) { case "windows" -> "ps1"; case "linux", "macos" -> "sh"; - default -> throw new UnsupportedOperationException(""); + default -> throw new UnsupportedOperationException(""); }; - String filename = file + "-" + version + "." + extension; + String filename = file + "-" + version + "." + extension; String resourcePath = "/openbas-agent/" + platform.toLowerCase() + "/"; InputStream in = getClass().getResourceAsStream("/agents" + resourcePath + filename); if (in == null) { // Dev mode, get from artifactory @@ -109,10 +109,10 @@ public String getFileOrDownloadFromJfrog(String platform, String file, String ad in = new BufferedInputStream(new URL(JFROG_BASE + resourcePath + filename).openStream()); } return IOUtils.toString(in, StandardCharsets.UTF_8) - .replace("${OPENBAS_URL}", openBASConfig.getBaseUrlForAgent()) - .replace("${OPENBAS_TOKEN}", adminToken) - .replace("${OPENBAS_UNSECURED_CERTIFICATE}", String.valueOf(openBASConfig.isUnsecuredCertificate())) - .replace("${OPENBAS_WITH_PROXY}", String.valueOf(openBASConfig.isWithProxy())); + .replace("${OPENBAS_URL}", openBASConfig.getBaseUrlForAgent()) + .replace("${OPENBAS_TOKEN}", adminToken) + .replace("${OPENBAS_UNSECURED_CERTIFICATE}", String.valueOf(openBASConfig.isUnsecuredCertificate())) + .replace("${OPENBAS_WITH_PROXY}", String.valueOf(openBASConfig.isWithProxy())); } public String generateInstallCommand(String platform, String token) throws IOException { diff --git a/openbas-model/src/main/java/io/openbas/database/repository/EndpointRepository.java b/openbas-model/src/main/java/io/openbas/database/repository/EndpointRepository.java index 3d2879f9b1..6a3733bcac 100644 --- a/openbas-model/src/main/java/io/openbas/database/repository/EndpointRepository.java +++ b/openbas-model/src/main/java/io/openbas/database/repository/EndpointRepository.java @@ -1,11 +1,7 @@ package io.openbas.database.repository; import io.openbas.database.model.Endpoint; -import io.openbas.database.model.Scenario; -import io.openbas.database.raw.RawAsset; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository;