Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <ijokarumawak@apache.org>
This commit is contained in:
Matt Gilman 2016-12-15 13:36:46 -05:00 committed by Koji Kawamura
parent 6ca25e10ef
commit 6c5d4084d5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
View File

@ -89,10 +89,11 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam; import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; 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.JAXBContext;
import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
@ -100,7 +101,6 @@ import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import java.io.InputStream; import java.io.InputStream;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -2044,6 +2044,7 @@ public class ProcessGroupResource extends ApplicationResource {
) )
public Response uploadTemplate( public Response uploadTemplate(
@Context final HttpServletRequest httpServletRequest, @Context final HttpServletRequest httpServletRequest,
@Context final UriInfo uriInfo,
@ApiParam( @ApiParam(
value = "The process group id.", value = "The process group id.",
required = true required = true
@ -2079,14 +2080,11 @@ public class ProcessGroupResource extends ApplicationResource {
if (isReplicateRequest()) { if (isReplicateRequest()) {
// convert request accordingly // convert request accordingly
URI importUri = null; final UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
try { uriBuilder.segment("process-groups", groupId, "templates", "import");
importUri = new URI(generateResourceUri("process-groups", groupId, "templates", "import")); final URI importUri = uriBuilder.build();
} catch (final URISyntaxException e) {
throw new WebApplicationException(e);
}
// change content type to JSON for serializing entity // change content type to XML for serializing entity
final Map<String, String> headersToOverride = new HashMap<>(); final Map<String, String> headersToOverride = new HashMap<>();
headersToOverride.put("content-type", MediaType.APPLICATION_XML); headersToOverride.put("content-type", MediaType.APPLICATION_XML);