Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Do not encode slash in templates in MP RestClient #5298

Merged
merged 1 commit into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -43,7 +43,7 @@ public String getPathParamName() {
@Override
public WebTarget handleParameter(WebTarget requestPart, Class<? extends Annotation> annotationClass, Object instance) {
Object resolvedValue = interfaceModel.resolveParamValue(instance, parameter);
return requestPart.resolveTemplate(pathParamName, resolvedValue);
return requestPart.resolveTemplate(pathParamName, resolvedValue, false);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package org.glassfish.jersey.restclient;

import org.eclipse.microprofile.rest.client.RestClientBuilder;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.json.Json;
import javax.json.JsonBuilderFactory;
import javax.json.JsonObject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.MediaType;
import java.net.URI;
import java.util.Collections;

public class PathParamTest extends JerseyTest {
@Path("/greet")
public static class GreetResource {
private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap());

@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/everything/everywhere")
public JsonObject getDefaultMessage() {
return createResponse("World");
}

private JsonObject createResponse(String who) {
String msg = String.format("%s %s!", "Hello", who);

return JSON.createObjectBuilder()
.add("message", msg)
.build();
}
}

@Path("/greet")
public static interface GreetResourceClient {

@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("{folderpath}")
JsonObject getDefaultMessage(@PathParam("folderpath") String folderPath);
}

@Override
protected Application configure() {
return new ResourceConfig(GreetResource.class);
}

@Test
public void testRestClientRequest() {
GreetResourceClient client = RestClientBuilder.newBuilder()
.baseUri(URI.create("http://localhost:9998")).build(GreetResourceClient.class);
JsonObject jsonObject = client.getDefaultMessage("everything/everywhere");
Assertions.assertEquals("Hello World!", jsonObject.getString("message"));
}

@Test
public void testStandardRequest() {
JsonObject jsonObject = target()
.path("greet").path("everything").path("everywhere")
.request()
.get(JsonObject.class);
Assertions.assertEquals("Hello World!", jsonObject.getString("message"));
}
}