Move param decoding to a static method

Author: wendigo

core/trino-main/src/main/java/io/trino/server/ResourceGroupStateInfoResource.java

@@ -25,13 +25,7 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import java.net.URLDecoder;
-import java.util.Arrays;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.server.security.ResourceSecurity.AccessType.MANAGEMENT_READ;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 
 @Path("/v1/resourceGroupState")
@@ -50,21 +44,13 @@ public ResourceGroupStateInfoResource(ResourceGroupInfoProvider resourceGroupInf
     @Produces(MediaType.APPLICATION_JSON)
     @Encoded
     @Path("{resourceGroupId: .+}")
-    public ResourceGroupInfo getQueryStateInfos(@PathParam("resourceGroupId") String resourceGroupIdString)
+    public ResourceGroupInfo getQueryStateInfos(@PathParam("resourceGroupId") ResourceGroupId resourceGroupId)
     {
-        if (!isNullOrEmpty(resourceGroupIdString)) {
-            return resourceGroupInfoProvider.tryGetResourceGroupInfo(
-                    new ResourceGroupId(
-                            Arrays.stream(resourceGroupIdString.split("/"))
-                                    .map(ResourceGroupStateInfoResource::urlDecode)
-                                    .collect(toImmutableList())))
-                    .orElseThrow(NotFoundException::new);
+        if (resourceGroupId == null) {
+            throw new NotFoundException();
         }
-        throw new NotFoundException();
-    }
 
-    private static String urlDecode(String value)
-    {
-        return URLDecoder.decode(value, UTF_8);
+        return resourceGroupInfoProvider.tryGetResourceGroupInfo(resourceGroupId)
+                .orElseThrow(NotFoundException::new);
     }
 }

core/trino-spi/src/main/java/io/trino/spi/resourcegroups/ResourceGroupId.java

@@ -16,14 +16,18 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toUnmodifiableList;
 
 public final class ResourceGroupId
 {
@@ -60,6 +64,15 @@ public ResourceGroupId(List<String> segments)
         this.segments = segments;
     }
 
+    // this is needed by JAX-RS, see: org.glassfish.jersey.internal.util.ReflectionHelper
+    public static ResourceGroupId valueOf(String value)
+    {
+        return new ResourceGroupId(
+                Arrays.stream(value.split("/"))
+                        .map(part -> URLDecoder.decode(part, UTF_8))
+                        .collect(toUnmodifiableList()));
+    }
+
     public String getLastSegment()
     {
         return segments.getLast();