|
38 | 38 | import java.util.Optional; |
39 | 39 | import jakarta.annotation.Priority; |
40 | 40 | import jakarta.inject.Inject; |
41 | | -import jakarta.ws.rs.HttpMethod; |
42 | 41 | import jakarta.ws.rs.NotAcceptableException; |
43 | 42 | import jakarta.ws.rs.NotAllowedException; |
44 | 43 | import jakarta.ws.rs.Priorities; |
45 | 44 | import jakarta.ws.rs.ProcessingException; |
46 | 45 | import jakarta.ws.rs.client.Entity; |
| 46 | +import jakarta.ws.rs.client.Invocation; |
47 | 47 | import jakarta.ws.rs.client.WebTarget; |
48 | 48 | import jakarta.ws.rs.container.ContainerRequestContext; |
49 | 49 | import jakarta.ws.rs.container.ContainerRequestFilter; |
@@ -151,33 +151,14 @@ else if (agentContext instanceof IDTokenSecurityContext idTokenSecurityContext) |
151 | 151 |
|
152 | 152 | try |
153 | 153 | { |
154 | | - Response clientResponse = switch (requestContext.getMethod()) |
155 | | - { |
156 | | - case HttpMethod.GET -> |
157 | | - target.request(readableMediaTypesArray) |
158 | | - .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT) |
159 | | - .get(); |
160 | | - case HttpMethod.POST -> |
161 | | - target.request() |
162 | | - .accept(readableMediaTypesArray) |
163 | | - .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT) |
164 | | - .post(Entity.entity(requestContext.getEntityStream(), requestContext.getMediaType())); |
165 | | - case "PATCH" -> |
166 | | - target.request() |
167 | | - .accept(readableMediaTypesArray) |
168 | | - .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT) |
169 | | - .method("PATCH", Entity.entity(requestContext.getEntityStream(), requestContext.getMediaType())); |
170 | | - case HttpMethod.PUT -> |
171 | | - target.request() |
172 | | - .accept(readableMediaTypesArray) |
173 | | - .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT) |
174 | | - .put(Entity.entity(requestContext.getEntityStream(), requestContext.getMediaType())); |
175 | | - case HttpMethod.DELETE -> |
176 | | - target.request() |
177 | | - .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT) |
178 | | - .delete(); |
179 | | - default -> throw new NotAllowedException(requestContext.getMethod()); |
180 | | - }; |
| 154 | + Invocation.Builder builder = target.request() |
| 155 | + .accept(readableMediaTypesArray) |
| 156 | + .header(HttpHeaders.USER_AGENT, GraphStoreClient.USER_AGENT); |
| 157 | + |
| 158 | + Response clientResponse = requestContext.hasEntity() |
| 159 | + ? builder.method(requestContext.getMethod(), |
| 160 | + Entity.entity(requestContext.getEntityStream(), requestContext.getMediaType())) |
| 161 | + : builder.method(requestContext.getMethod()); |
181 | 162 |
|
182 | 163 | try (clientResponse) |
183 | 164 | { |
|
0 commit comments