diff --git a/build.gradle b/build.gradle index d6df134..13ad992 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' id 'io.freefair.lombok' version '8.14.4' - id 'org.springframework.boot' version '3.3.8' - id 'io.spring.dependency-management' version '1.1.6' + id 'org.springframework.boot' version '3.5.8' + id 'io.spring.dependency-management' version '1.1.7' id 'jacoco' id 'org.sonarqube' version '6.3.1.5724' id 'maven-publish' @@ -64,7 +64,7 @@ dependencies { runtimeOnly 'io.micrometer:micrometer-registry-prometheus' // Spring Doc - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.17' // ipfs implementation 'com.github.ipfs:java-ipfs-http-client:1.4.4' diff --git a/iexec-result-proxy-library/build.gradle b/iexec-result-proxy-library/build.gradle index 3109960..d8299b4 100644 --- a/iexec-result-proxy-library/build.gradle +++ b/iexec-result-proxy-library/build.gradle @@ -6,7 +6,7 @@ plugins { } dependencies { - implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.8') + implementation platform('org.springframework.boot:spring-boot-dependencies:3.5.8') implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" implementation "com.iexec.common:iexec-common:$iexecCommonVersion" } diff --git a/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java b/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java index 3780bbc..1ef1c58 100644 --- a/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java +++ b/src/main/java/com/iexec/resultproxy/ipfs/IpfsService.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH + * Copyright 2020-2026 IEXEC BLOCKCHAIN TECH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,8 @@ import java.net.URL; import java.util.Optional; -@Service @Slf4j +@Service public class IpfsService implements SmartLifecycle { private IPFS ipfs; @@ -52,7 +52,7 @@ public IpfsService(final IpfsConfig ipfsConfig) { } public Optional get(final String ipfsHash) { - if (!isIpfsHash(ipfsHash)){ + if (!isIpfsHash(ipfsHash)) { return Optional.empty(); } final Multihash filePointer = Multihash.fromBase58(ipfsHash); diff --git a/src/main/java/com/iexec/resultproxy/ipfs/task/IpfsNameService.java b/src/main/java/com/iexec/resultproxy/ipfs/task/IpfsNameService.java index 4b0f578..2e175f8 100644 --- a/src/main/java/com/iexec/resultproxy/ipfs/task/IpfsNameService.java +++ b/src/main/java/com/iexec/resultproxy/ipfs/task/IpfsNameService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2020-2026 IEXEC BLOCKCHAIN TECH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.iexec.resultproxy.ipfs.task; import lombok.extern.slf4j.Slf4j; @@ -11,12 +27,11 @@ * * /!\ WARN: Mongo volume should be kept between reboots to keep taskId->ipfsHash mapping alive * */ -@Service @Slf4j +@Service public class IpfsNameService { - - private IpfsNameRepository ipfsNameRepository; + private final IpfsNameRepository ipfsNameRepository; public IpfsNameService(IpfsNameRepository ipfsNameRepository) { this.ipfsNameRepository = ipfsNameRepository; @@ -38,5 +53,4 @@ public String getIpfsHashForTask(String taskId) { return ""; } - }