springboot 3.1.2 (#88)

Signed-off-by: Abdelsalem <[email protected]>
Co-authored-by: HARPER Jon <[email protected]>

Author: AbdelHedhili

pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>12</version>
+        <version>15</version>
         <relativePath/>
     </parent>
 
@@ -42,7 +42,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>25</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>26</gridsuite-dependencies.version>
 
         <nimbus-jose-jwt.version>8.14</nimbus-jose-jwt.version>
         <oauth2-oidc-sdk.version>7.3</oauth2-oidc-sdk.version>
@@ -59,8 +59,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

src/main/java/org/gridsuite/gateway/endpoints/EndPointElementServer.java

@@ -15,15 +15,17 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.springframework.http.HttpMethod.*;
+
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
  */
 public interface EndPointElementServer extends EndPointServer {
 
     String QUERY_PARAM_IDS = "ids";
 
-    Set<HttpMethod> ALLOWED_HTTP_METHODS = Set.of(HttpMethod.GET, HttpMethod.HEAD,
-        HttpMethod.PUT, HttpMethod.POST, HttpMethod.DELETE
+    Set<HttpMethod> ALLOWED_HTTP_METHODS = Set.of(GET, HEAD,
+            PUT, POST, DELETE
     );
 
     static UUID getUuid(String uuid) {
@@ -60,27 +62,22 @@ default Optional<AccessControlInfos> getAccessControlInfos(@NonNull ServerHttpRe
         UUID elementUuid = getElementUuidIfExist(path);
 
         // /<elements>/{elementUuid} or /<elements>/**?id=
-        switch (Objects.requireNonNull(request.getMethod())) {
-            case HEAD:
-            case GET: {
-                if (elementUuid != null) {
-                    return Optional.of(AccessControlInfos.create(List.of(elementUuid)));
+        HttpMethod httpMethod = Objects.requireNonNull(request.getMethod());
+        if (httpMethod.equals(HEAD) || httpMethod.equals(GET)) {
+            if (elementUuid != null) {
+                return Optional.of(AccessControlInfos.create(List.of(elementUuid)));
+            } else {
+                if (request.getQueryParams().get(QUERY_PARAM_IDS) == null) {
+                    return Optional.empty();
                 } else {
-                    if (request.getQueryParams().get(QUERY_PARAM_IDS) == null) {
-                        return Optional.empty();
-                    } else {
-                        List<String> ids = request.getQueryParams().get(QUERY_PARAM_IDS);
-                        List<UUID> elementUuids = ids.stream().map(EndPointElementServer::getUuid).filter(Objects::nonNull).collect(Collectors.toList());
-                        return elementUuids.size() == ids.size() ? Optional.of(AccessControlInfos.create(elementUuids)) : Optional.empty();
-                    }
+                    List<String> ids = request.getQueryParams().get(QUERY_PARAM_IDS);
+                    List<UUID> elementUuids = ids.stream().map(EndPointElementServer::getUuid).filter(Objects::nonNull).collect(Collectors.toList());
+                    return elementUuids.size() == ids.size() ? Optional.of(AccessControlInfos.create(elementUuids)) : Optional.empty();
                 }
             }
-            case POST: // Only sub elements (elements only via explore server)
-            case PUT:
-            case DELETE:
-                return elementUuid == null ? Optional.empty() : Optional.of(AccessControlInfos.create(List.of(elementUuid)));
-            default:
-                return Optional.empty();
+        } else if (httpMethod.equals(POST) || httpMethod.equals(PUT) || httpMethod.equals(DELETE)) {
+            return elementUuid == null ? Optional.empty() : Optional.of(AccessControlInfos.create(List.of(elementUuid)));
         }
+        return Optional.empty();
     }
 }

src/main/java/org/gridsuite/gateway/filters/ElementAccessControllerGlobalPreFilter.java

@@ -20,7 +20,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.server.RequestPath;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
@@ -37,6 +37,7 @@
 import static org.gridsuite.gateway.GatewayConfig.END_POINT_SERVICE_NAME;
 import static org.gridsuite.gateway.GatewayConfig.HEADER_USER_ID;
 import static org.gridsuite.gateway.endpoints.EndPointElementServer.QUERY_PARAM_IDS;
+import static org.springframework.http.HttpStatus.*;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
@@ -91,11 +92,11 @@ public Mono<Void> filter(@NonNull ServerWebExchange exchange, @NonNull GatewayFi
 
         // Is a method allowed ?
         if (!endPointElementServer.isAllowedMethod(exchange.getRequest().getMethod())) {
-            return completeWithCode(exchange, HttpStatus.FORBIDDEN);
+            return completeWithCode(exchange, FORBIDDEN);
         }
 
         Optional<AccessControlInfos> accessControlInfos = endPointElementServer.getAccessControlInfos(exchange.getRequest());
-        return accessControlInfos.isEmpty() ? completeWithCode(exchange, HttpStatus.FORBIDDEN) : isAccessAllowed(exchange, chain, accessControlInfos.get());
+        return accessControlInfos.isEmpty() ? completeWithCode(exchange, FORBIDDEN) : isAccessAllowed(exchange, chain, accessControlInfos.get());
     }
 
     private Mono<Void> isAccessAllowed(ServerWebExchange exchange, GatewayFilterChain chain, AccessControlInfos accessControlInfos) {
@@ -111,16 +112,15 @@ private Mono<Void> isAccessAllowed(ServerWebExchange exchange, GatewayFilterChai
             )
             .header(HEADER_USER_ID, Objects.requireNonNull(httpHeaders.get(HEADER_USER_ID)).get(0))
             .exchangeToMono(response -> {
-                switch (response.statusCode()) {
-                    case OK:
-                        return chain.filter(exchange);
-                    case NOT_FOUND:
-                        return completeWithCode(exchange, HttpStatus.NOT_FOUND);
-                    case FORBIDDEN:
-                        return completeWithCode(exchange, HttpStatus.FORBIDDEN);
-                    default:
-                        return response.createException().flatMap(Mono::error);
+                HttpStatusCode httpStatusCode = response.statusCode();
+                if (httpStatusCode.equals(OK)) {
+                    return chain.filter(exchange);
+                } else if (httpStatusCode.equals(NOT_FOUND)) {
+                    return completeWithCode(exchange, NOT_FOUND);
+                } else if (httpStatusCode.equals(FORBIDDEN)) {
+                    return completeWithCode(exchange, FORBIDDEN);
                 }
+                return response.createException().flatMap(Mono::error);
             })
             .publishOn(Schedulers.boundedElastic())
             .log(ROOT_CATEGORY_REACTOR, Level.FINE);

src/test/java/org/gridsuite/gateway/TokenValidationTest.java

@@ -24,7 +24,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.cloud.contract.wiremock.WireMockConfigurationCustomizer;
 import org.springframework.context.annotation.Bean;