You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2016/12/27 06:45:03 UTC
nifi git commit: NIFI-3207: Fixed Template upload import URI
Repository: nifi
Updated Branches:
refs/heads/master 6ca25e10e -> 6c5d4084d
NIFI-3207: Fixed Template upload import URI
- Fixing the importUri when replicating a Template upload request. Previously was leveraging getResourceUri which considers proxy headers meant for client responses.
This closes #1334.
Signed-off-by: Koji Kawamura <ij...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6c5d4084
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6c5d4084
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6c5d4084
Branch: refs/heads/master
Commit: 6c5d4084d586698575a75ee11b4407e4257254b4
Parents: 6ca25e1
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Dec 15 13:36:46 2016 -0500
Committer: Koji Kawamura <ij...@apache.org>
Committed: Tue Dec 27 15:44:25 2016 +0900
----------------------------------------------------------------------
.../apache/nifi/web/api/ProcessGroupResource.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/6c5d4084/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
index 4a8f8a9..75bdc3e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
@@ -89,10 +89,11 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -100,7 +101,6 @@ import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
import java.io.InputStream;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -2044,6 +2044,7 @@ public class ProcessGroupResource extends ApplicationResource {
)
public Response uploadTemplate(
@Context final HttpServletRequest httpServletRequest,
+ @Context final UriInfo uriInfo,
@ApiParam(
value = "The process group id.",
required = true
@@ -2079,14 +2080,11 @@ public class ProcessGroupResource extends ApplicationResource {
if (isReplicateRequest()) {
// convert request accordingly
- URI importUri = null;
- try {
- importUri = new URI(generateResourceUri("process-groups", groupId, "templates", "import"));
- } catch (final URISyntaxException e) {
- throw new WebApplicationException(e);
- }
+ final UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.segment("process-groups", groupId, "templates", "import");
+ final URI importUri = uriBuilder.build();
- // change content type to JSON for serializing entity
+ // change content type to XML for serializing entity
final Map<String, String> headersToOverride = new HashMap<>();
headersToOverride.put("content-type", MediaType.APPLICATION_XML);