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

NIFI-4019: 

- Adding support for X-Forwarded-* headers.
- Unrelated code clean up.
- Addressing additional proxying issues.
- Addressing mistyped landing page.
- Handled trailing slashes in proxy headers for context path
This commit is contained in:
Matt Gilman 2017-06-08 09:38:07 -04:00 committed by Jeff Storck
parent c0ad5bcc7b
commit 490e1da5db
81 changed files with 278 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>AmbariReportingTask</title> <title>AmbariReportingTask</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.ConsumeAMQP/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeAMQP</title> <title>ConsumeAMQP</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.PublishAMQP/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PublishAMQP</title> <title>PublishAMQP</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/resources/docs/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>CompareFuzzyHash</title> <title>CompareFuzzyHash</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" <link rel="stylesheet" href="../../../../../css/component-usage.css"
type="text/css" /> type="text/css" />
</head> </head>

2
nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>DataDogReportingTask</title> <title>DataDogReportingTask</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumeIMAP/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeIMAP</title> <title>ConsumeIMAP</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" <link rel="stylesheet" href="../../../../../css/component-usage.css"
type="text/css" /> type="text/css" />
</head> </head>

2
nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumePOP3/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumePOP3</title> <title>ConsumePOP3</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" <link rel="stylesheet" href="../../../../../css/component-usage.css"
type="text/css" /> type="text/css" />
</head> </head>

2
nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/resources/docs/org.apache.nifi.processors.evtx.ParseEvtx/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ParseEvtx</title> <title>ParseEvtx</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSink/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ExecuteFlumeSink</title> <title>ExecuteFlumeSink</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSource/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ExecuteFlumeSource</title> <title>ExecuteFlumeSource</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
View File

@ -100,7 +100,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
xmlStreamWriter.writeStartElement("link"); xmlStreamWriter.writeStartElement("link");
xmlStreamWriter.writeAttribute("rel", "stylesheet"); xmlStreamWriter.writeAttribute("rel", "stylesheet");
xmlStreamWriter.writeAttribute("href", "/nifi-docs/css/component-usage.css"); xmlStreamWriter.writeAttribute("href", "../../../../../css/component-usage.css");
xmlStreamWriter.writeAttribute("type", "text/css"); xmlStreamWriter.writeAttribute("type", "text/css");
xmlStreamWriter.writeEndElement(); xmlStreamWriter.writeEndElement();
xmlStreamWriter.writeEndElement(); xmlStreamWriter.writeEndElement();
@ -438,7 +438,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
xmlStreamWriter.writeCharacters(", "); xmlStreamWriter.writeCharacters(", ");
} }
xmlStreamWriter.writeCharacters("whether a property supports the "); xmlStreamWriter.writeCharacters("whether a property supports the ");
writeLink(xmlStreamWriter, "NiFi Expression Language", "/nifi-docs/html/expression-language-guide.html"); writeLink(xmlStreamWriter, "NiFi Expression Language", "../../../../../html/expression-language-guide.html");
} }
if (containsSensitiveProperties) { if (containsSensitiveProperties) {
xmlStreamWriter.writeCharacters(", and whether a property is considered " + "\"sensitive\", meaning that its value will be encrypted. Before entering a " xmlStreamWriter.writeCharacters(", and whether a property is considered " + "\"sensitive\", meaning that its value will be encrypted. Before entering a "
@ -596,7 +596,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
throws XMLStreamException { throws XMLStreamException {
xmlStreamWriter.writeCharacters(" "); xmlStreamWriter.writeCharacters(" ");
xmlStreamWriter.writeStartElement("img"); xmlStreamWriter.writeStartElement("img");
xmlStreamWriter.writeAttribute("src", "/nifi-docs/html/images/iconInfo.png"); xmlStreamWriter.writeAttribute("src", "../../../../../html/images/iconInfo.png");
xmlStreamWriter.writeAttribute("alt", description); xmlStreamWriter.writeAttribute("alt", description);
xmlStreamWriter.writeAttribute("title", description); xmlStreamWriter.writeAttribute("title", description);
xmlStreamWriter.writeEndElement(); xmlStreamWriter.writeEndElement();
@ -799,7 +799,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
xmlStreamWriter.writeCharacters(separator); xmlStreamWriter.writeCharacters(separator);
} }
} }
writeLink(xmlStreamWriter, linkedComponent.getSimpleName(), "/nifi-docs/components/" + group + "/" + id + "/" + version + "/" + linkedComponent.getCanonicalName() + "/index.html"); writeLink(xmlStreamWriter, linkedComponent.getSimpleName(), "../../../../../components/" + group + "/" + id + "/" + version + "/" + linkedComponent.getCanonicalName() + "/index.html");
++index; ++index;
} else { } else {
@ -827,7 +827,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter {
final String id = firstCoordinate.getId(); final String id = firstCoordinate.getId();
final String version = firstCoordinate.getVersion(); final String version = firstCoordinate.getVersion();
final String link = "/nifi-docs/components/" + group + "/" + id + "/" + version + "/" + className + "/index.html"; final String link = "../../../../../components/" + group + "/" + id + "/" + version + "/" + className + "/index.html";
final int indexOfLastPeriod = className.lastIndexOf(".") + 1; final int indexOfLastPeriod = className.lastIndexOf(".") + 1;

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

@ -162,7 +162,7 @@ public class AccessPolicyResource extends ApplicationResource {
final AccessPolicyEntity entity = serviceFacade.getAccessPolicy(requestAction, resource); final AccessPolicyEntity entity = serviceFacade.getAccessPolicy(requestAction, resource);
populateRemainingAccessPolicyEntityContent(entity); populateRemainingAccessPolicyEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ----------------------- // -----------------------
@ -255,7 +255,7 @@ public class AccessPolicyResource extends ApplicationResource {
populateRemainingAccessPolicyEntityContent(entity); populateRemainingAccessPolicyEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -312,7 +312,7 @@ public class AccessPolicyResource extends ApplicationResource {
final AccessPolicyEntity entity = serviceFacade.getAccessPolicy(id); final AccessPolicyEntity entity = serviceFacade.getAccessPolicy(id);
populateRemainingAccessPolicyEntityContent(entity); populateRemainingAccessPolicyEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -397,7 +397,7 @@ public class AccessPolicyResource extends ApplicationResource {
final AccessPolicyEntity entity = serviceFacade.updateAccessPolicy(revision, accessPolicyDTO); final AccessPolicyEntity entity = serviceFacade.updateAccessPolicy(revision, accessPolicyDTO);
populateRemainingAccessPolicyEntityContent(entity); populateRemainingAccessPolicyEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -484,7 +484,7 @@ public class AccessPolicyResource extends ApplicationResource {
(revision, accessPolicyEntity) -> { (revision, accessPolicyEntity) -> {
// delete the specified access policy // delete the specified access policy
final AccessPolicyEntity entity = serviceFacade.deleteAccessPolicy(revision, accessPolicyEntity.getId()); final AccessPolicyEntity entity = serviceFacade.deleteAccessPolicy(revision, accessPolicyEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -122,7 +122,7 @@ public class AccessResource extends ApplicationResource {
entity.setConfig(accessConfiguration); entity.setConfig(accessConfiguration);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**

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

@ -100,11 +100,17 @@ public abstract class ApplicationResource {
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String CLIENT_ID = "clientId"; public static final String CLIENT_ID = "clientId";
public static final String PROXY_SCHEME_HTTP_HEADER = "X-ProxyScheme"; public static final String PROXY_SCHEME_HTTP_HEADER = "X-ProxyScheme";
public static final String PROXY_HOST_HTTP_HEADER = "X-ProxyHost"; public static final String PROXY_HOST_HTTP_HEADER = "X-ProxyHost";
public static final String PROXY_PORT_HTTP_HEADER = "X-ProxyPort"; public static final String PROXY_PORT_HTTP_HEADER = "X-ProxyPort";
public static final String PROXY_CONTEXT_PATH_HTTP_HEADER = "X-ProxyContextPath"; public static final String PROXY_CONTEXT_PATH_HTTP_HEADER = "X-ProxyContextPath";
public static final String FORWARDED_PROTO_HTTP_HEADER = "X-Forwarded-Proto";
public static final String FORWARDED_HOST_HTTP_HEADER = "X-Forwarded-Server";
public static final String FORWARDED_PORT_HTTP_HEADER = "X-Forwarded-Port";
public static final String FORWARDED_CONTEXT_HTTP_HEADER = "X-Forwarded-Context";
protected static final String NON_GUARANTEED_ENDPOINT = "Note: This endpoint is subject to change as NiFi and it's REST API evolve."; protected static final String NON_GUARANTEED_ENDPOINT = "Note: This endpoint is subject to change as NiFi and it's REST API evolve.";
private static final Logger logger = LoggerFactory.getLogger(ApplicationResource.class); private static final Logger logger = LoggerFactory.getLogger(ApplicationResource.class);
@ -141,10 +147,10 @@ public abstract class ApplicationResource {
try { try {
// check for proxy settings // check for proxy settings
final String scheme = httpServletRequest.getHeader(PROXY_SCHEME_HTTP_HEADER); final String scheme = getFirstHeaderValue(PROXY_SCHEME_HTTP_HEADER, FORWARDED_PROTO_HTTP_HEADER);
final String host = httpServletRequest.getHeader(PROXY_HOST_HTTP_HEADER); final String host = getFirstHeaderValue(PROXY_HOST_HTTP_HEADER, FORWARDED_HOST_HTTP_HEADER);
final String port = httpServletRequest.getHeader(PROXY_PORT_HTTP_HEADER); final String port = getFirstHeaderValue(PROXY_PORT_HTTP_HEADER, FORWARDED_PORT_HTTP_HEADER);
String baseContextPath = httpServletRequest.getHeader(PROXY_CONTEXT_PATH_HTTP_HEADER); String baseContextPath = getFirstHeaderValue(PROXY_CONTEXT_PATH_HTTP_HEADER, FORWARDED_CONTEXT_HTTP_HEADER);
// if necessary, prepend the context path // if necessary, prepend the context path
String resourcePath = uri.getPath(); String resourcePath = uri.getPath();
@ -154,6 +160,10 @@ public abstract class ApplicationResource {
baseContextPath = "/" + baseContextPath; baseContextPath = "/" + baseContextPath;
} }
if (baseContextPath.endsWith("/")) {
baseContextPath = StringUtils.substringBeforeLast(baseContextPath, "/");
}
// determine the complete resource path // determine the complete resource path
resourcePath = baseContextPath + resourcePath; resourcePath = baseContextPath + resourcePath;
} }
@ -202,18 +212,6 @@ public abstract class ApplicationResource {
return response.cacheControl(cacheControl); return response.cacheControl(cacheControl);
} }
/**
* If the application is operating as a node, then this method adds the cluster context information to the response using the response header 'X-CLUSTER_CONTEXT'.
*
* @param response response
* @return builder
*/
protected ResponseBuilder clusterContext(final ResponseBuilder response) {
// TODO: Remove this method. Since ClusterContext was removed, it is no longer needed. However,
// it is called by practically every endpoint so for now it is just being stubbed out.
return response;
}
protected String generateUuid() { protected String generateUuid() {
final Optional<String> seed = getIdGenerationSeed(); final Optional<String> seed = getIdGenerationSeed();
UUID uuid; UUID uuid;
@ -345,16 +343,20 @@ public abstract class ApplicationResource {
} }
} }
// set the proxy details to request details if not already set client // if the scheme is not set by the client, include the details from this request but don't override
final String proxyScheme = httpServletRequest.getHeader(PROXY_SCHEME_HTTP_HEADER); final String proxyScheme = getFirstHeaderValue(PROXY_SCHEME_HTTP_HEADER, FORWARDED_PROTO_HTTP_HEADER);
if (proxyScheme == null) { if (proxyScheme == null) {
result.put(PROXY_SCHEME_HTTP_HEADER, httpServletRequest.getScheme()); result.put(PROXY_SCHEME_HTTP_HEADER, httpServletRequest.getScheme());
} }
final String proxyHost = httpServletRequest.getHeader(PROXY_HOST_HTTP_HEADER);
// if the host is not set by the client, include the details from this request but don't override
final String proxyHost = getFirstHeaderValue(PROXY_HOST_HTTP_HEADER, FORWARDED_HOST_HTTP_HEADER);
if (proxyHost == null) { if (proxyHost == null) {
result.put(PROXY_HOST_HTTP_HEADER, httpServletRequest.getServerName()); result.put(PROXY_HOST_HTTP_HEADER, httpServletRequest.getServerName());
} }
final String proxyPort = httpServletRequest.getHeader(PROXY_PORT_HTTP_HEADER);
// if the port is not set by the client, include the details from this request but don't override
final String proxyPort = getFirstHeaderValue(PROXY_PORT_HTTP_HEADER, FORWARDED_PORT_HTTP_HEADER);
if (proxyPort == null) { if (proxyPort == null) {
result.put(PROXY_PORT_HTTP_HEADER, String.valueOf(httpServletRequest.getServerPort())); result.put(PROXY_PORT_HTTP_HEADER, String.valueOf(httpServletRequest.getServerPort()));
} }
@ -362,6 +364,31 @@ public abstract class ApplicationResource {
return result; return result;
} }
/**
* Returns the value for the first key discovered when inspecting the current request. Will
* return null if there are no keys specified or if none of the specified keys are found.
*
* @param keys http header keys
* @return the value for the first key found
*/
private String getFirstHeaderValue(final String... keys) {
if (keys == null) {
return null;
}
for (final String key : keys) {
final String value = httpServletRequest.getHeader(key);
// if we found an entry for this key, return the value
if (value != null) {
return value;
}
}
// unable to find any matching keys
return null;
}
/** /**
* Checks whether the request is part of a two-phase commit style request (either phase 1 or phase 2) * Checks whether the request is part of a two-phase commit style request (either phase 1 or phase 2)
* *

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

@ -143,7 +143,7 @@ public class ConnectionResource extends ApplicationResource {
populateRemainingConnectionEntityContent(entity); populateRemainingConnectionEntityContent(entity);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -272,7 +272,7 @@ public class ConnectionResource extends ApplicationResource {
populateRemainingConnectionEntityContent(entity); populateRemainingConnectionEntityContent(entity);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
}); });
} }
@ -358,7 +358,7 @@ public class ConnectionResource extends ApplicationResource {
final ConnectionEntity entity = serviceFacade.deleteConnection(revision, connectionEntity.getId()); final ConnectionEntity entity = serviceFacade.deleteConnection(revision, connectionEntity.getId());
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -168,7 +168,7 @@ public class ControllerResource extends ApplicationResource {
} }
final ControllerConfigurationEntity entity = serviceFacade.getControllerConfiguration(); final ControllerConfigurationEntity entity = serviceFacade.getControllerConfiguration();
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -227,7 +227,7 @@ public class ControllerResource extends ApplicationResource {
null, null,
(revision, configEntity) -> { (revision, configEntity) -> {
final ControllerConfigurationEntity entity = serviceFacade.updateControllerConfiguration(revision, configEntity.getComponent()); final ControllerConfigurationEntity entity = serviceFacade.updateControllerConfiguration(revision, configEntity.getComponent());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -329,7 +329,7 @@ public class ControllerResource extends ApplicationResource {
reportingTaskResource.populateRemainingReportingTaskEntityContent(entity); reportingTaskResource.populateRemainingReportingTaskEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -500,7 +500,7 @@ public class ControllerResource extends ApplicationResource {
controllerServiceResource.populateRemainingControllerServiceEntityContent(entity); controllerServiceResource.populateRemainingControllerServiceEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }

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

@ -188,7 +188,7 @@ public class ControllerServiceResource extends ApplicationResource {
final ControllerServiceEntity entity = serviceFacade.getControllerService(id); final ControllerServiceEntity entity = serviceFacade.getControllerService(id);
populateRemainingControllerServiceEntityContent(entity); populateRemainingControllerServiceEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -253,7 +253,7 @@ public class ControllerServiceResource extends ApplicationResource {
entity.setPropertyDescriptor(descriptor); entity.setPropertyDescriptor(descriptor);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -307,7 +307,7 @@ public class ControllerServiceResource extends ApplicationResource {
entity.setComponentState(state); entity.setComponentState(state);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -368,7 +368,7 @@ public class ControllerServiceResource extends ApplicationResource {
final ComponentStateEntity entity = new ComponentStateEntity(); final ComponentStateEntity entity = new ComponentStateEntity();
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -419,7 +419,7 @@ public class ControllerServiceResource extends ApplicationResource {
// get the controller service // get the controller service
final ControllerServiceReferencingComponentsEntity entity = serviceFacade.getControllerServiceReferencingComponents(id); final ControllerServiceReferencingComponentsEntity entity = serviceFacade.getControllerServiceReferencingComponents(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -551,7 +551,7 @@ public class ControllerServiceResource extends ApplicationResource {
final ControllerServiceReferencingComponentsEntity entity = serviceFacade.updateControllerServiceReferencingComponents( final ControllerServiceReferencingComponentsEntity entity = serviceFacade.updateControllerServiceReferencingComponents(
referencingRevisions, updateReferenceRequest.getId(), scheduledState, controllerServiceState); referencingRevisions, updateReferenceRequest.getId(), scheduledState, controllerServiceState);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -638,7 +638,7 @@ public class ControllerServiceResource extends ApplicationResource {
final ControllerServiceEntity entity = serviceFacade.updateControllerService(revision, controllerService); final ControllerServiceEntity entity = serviceFacade.updateControllerService(revision, controllerService);
populateRemainingControllerServiceEntityContent(entity); populateRemainingControllerServiceEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -725,7 +725,7 @@ public class ControllerServiceResource extends ApplicationResource {
(revision, controllerServiceEntity) -> { (revision, controllerServiceEntity) -> {
// delete the specified controller service // delete the specified controller service
final ControllerServiceEntity entity = serviceFacade.deleteControllerService(revision, controllerServiceEntity.getId()); final ControllerServiceEntity entity = serviceFacade.deleteControllerService(revision, controllerServiceEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -205,7 +205,7 @@ public class CountersResource extends ApplicationResource {
entity.setCounters(countersReport); entity.setCounters(countersReport);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -266,7 +266,7 @@ public class CountersResource extends ApplicationResource {
entity.setCounter(counter); entity.setCounter(counter);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -473,13 +473,13 @@ public class DataTransferResource extends ApplicationResource {
entity.setMessage(e.getMessage()); entity.setMessage(e.getMessage());
Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST).entity(entity); Response.ResponseBuilder builder = Response.status(Response.Status.BAD_REQUEST).entity(entity);
return clusterContext(noCache(builder)).build(); return noCache(builder).build();
} }
return responseCreator.unexpectedErrorResponse(portId, transactionId, e); return responseCreator.unexpectedErrorResponse(portId, transactionId, e);
} }
return clusterContext(noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager))).build(); return noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager)).build();
} }
@ -579,7 +579,7 @@ public class DataTransferResource extends ApplicationResource {
// it's not clear if there is an issue at server side, or cancel operation has been accomplished. // it's not clear if there is an issue at server side, or cancel operation has been accomplished.
// Above conditions can guarantee this is the latter case, we return 200 OK here. // Above conditions can guarantee this is the latter case, we return 200 OK here.
entity.setResponseCode(ResponseCode.CANCEL_TRANSACTION.getCode()); entity.setResponseCode(ResponseCode.CANCEL_TRANSACTION.getCode());
return clusterContext(noCache(Response.ok(entity))).build(); return noCache(Response.ok(entity)).build();
} else { } else {
return responseCreator.unexpectedErrorResponse(portId, transactionId, e); return responseCreator.unexpectedErrorResponse(portId, transactionId, e);
} }
@ -592,7 +592,7 @@ public class DataTransferResource extends ApplicationResource {
return responseCreator.unexpectedErrorResponse(portId, transactionId, e); return responseCreator.unexpectedErrorResponse(portId, transactionId, e);
} }
return clusterContext(noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager))).build(); return noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager)).build();
} }
private Response cancelTransaction(String transactionId, TransactionResultEntity entity) { private Response cancelTransaction(String transactionId, TransactionResultEntity entity) {
@ -798,7 +798,7 @@ public class DataTransferResource extends ApplicationResource {
final TransactionResultEntity entity = new TransactionResultEntity(); final TransactionResultEntity entity = new TransactionResultEntity();
entity.setResponseCode(ResponseCode.CONTINUE_TRANSACTION.getCode()); entity.setResponseCode(ResponseCode.CONTINUE_TRANSACTION.getCode());
entity.setMessage("Extended TTL."); entity.setMessage("Extended TTL.");
return clusterContext(noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager))).build(); return noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager)).build();
} catch (HandshakeException e) { } catch (HandshakeException e) {
return responseCreator.handshakeExceptionResponse(e); return responseCreator.handshakeExceptionResponse(e);

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

@ -256,7 +256,7 @@ public class FlowResource extends ApplicationResource {
) )
public Response generateClientId() { public Response generateClientId() {
authorizeFlow(); authorizeFlow();
return clusterContext(generateOkResponse(generateUuid())).build(); return generateOkResponse(generateUuid()).build();
} }
/** /**
@ -292,7 +292,7 @@ public class FlowResource extends ApplicationResource {
} }
final FlowConfigurationEntity entity = serviceFacade.getFlowConfiguration(); final FlowConfigurationEntity entity = serviceFacade.getFlowConfiguration();
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -329,7 +329,7 @@ public class FlowResource extends ApplicationResource {
final CurrentUserEntity entity = serviceFacade.getCurrentUser(); final CurrentUserEntity entity = serviceFacade.getCurrentUser();
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -375,7 +375,7 @@ public class FlowResource extends ApplicationResource {
// get this process group flow // get this process group flow
final ProcessGroupFlowEntity entity = serviceFacade.getProcessGroupFlow(groupId); final ProcessGroupFlowEntity entity = serviceFacade.getProcessGroupFlow(groupId);
populateRemainingFlowContent(entity.getProcessGroupFlow()); populateRemainingFlowContent(entity.getProcessGroupFlow());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------------------- // -------------------
@ -424,7 +424,7 @@ public class FlowResource extends ApplicationResource {
entity.setControllerServices(controllerServices); entity.setControllerServices(controllerServices);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -475,7 +475,7 @@ public class FlowResource extends ApplicationResource {
entity.setControllerServices(controllerServices); entity.setControllerServices(controllerServices);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// --------------- // ---------------
@ -523,7 +523,7 @@ public class FlowResource extends ApplicationResource {
entity.setReportingTasks(reportingTasks); entity.setReportingTasks(reportingTasks);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -669,7 +669,7 @@ public class FlowResource extends ApplicationResource {
// update the process group // update the process group
final ScheduleComponentsEntity entity = serviceFacade.scheduleComponents(id, scheduledState, componentRevisions); final ScheduleComponentsEntity entity = serviceFacade.scheduleComponents(id, scheduledState, componentRevisions);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -716,7 +716,7 @@ public class FlowResource extends ApplicationResource {
entity.setSearchResultsDTO(results); entity.setSearchResultsDTO(results);
// generate the response // generate the response
return clusterContext(noCache(Response.ok(entity))).build(); return noCache(Response.ok(entity)).build();
} }
/** /**
@ -759,7 +759,7 @@ public class FlowResource extends ApplicationResource {
entity.setControllerStatus(controllerStatus); entity.setControllerStatus(controllerStatus);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -816,7 +816,7 @@ public class FlowResource extends ApplicationResource {
entity.setClusterSummary(clusterConfiguration); entity.setClusterSummary(clusterConfiguration);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -856,7 +856,7 @@ public class FlowResource extends ApplicationResource {
} }
final ControllerBulletinsEntity entity = serviceFacade.getControllerBulletins(); final ControllerBulletinsEntity entity = serviceFacade.getControllerBulletins();
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -900,7 +900,7 @@ public class FlowResource extends ApplicationResource {
entity.setBanners(bannerDTO); entity.setBanners(bannerDTO);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -957,7 +957,7 @@ public class FlowResource extends ApplicationResource {
entity.setProcessorTypes(serviceFacade.getProcessorTypes(bundleGroupFilter, bundleArtifactFilter, typeFilter)); entity.setProcessorTypes(serviceFacade.getProcessorTypes(bundleGroupFilter, bundleArtifactFilter, typeFilter));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1042,7 +1042,7 @@ public class FlowResource extends ApplicationResource {
bundleGroupFilter, bundleArtifactFilter, typeFilter)); bundleGroupFilter, bundleArtifactFilter, typeFilter));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1099,7 +1099,7 @@ public class FlowResource extends ApplicationResource {
entity.setReportingTaskTypes(serviceFacade.getReportingTaskTypes(bundleGroupFilter, bundleArtifactFilter, typeFilter)); entity.setReportingTaskTypes(serviceFacade.getReportingTaskTypes(bundleGroupFilter, bundleArtifactFilter, typeFilter));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1140,7 +1140,7 @@ public class FlowResource extends ApplicationResource {
entity.setPrioritizerTypes(serviceFacade.getWorkQueuePrioritizerTypes()); entity.setPrioritizerTypes(serviceFacade.getWorkQueuePrioritizerTypes());
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1199,7 +1199,7 @@ public class FlowResource extends ApplicationResource {
entity.setAbout(aboutDTO); entity.setAbout(aboutDTO);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// -------------- // --------------
@ -1308,7 +1308,7 @@ public class FlowResource extends ApplicationResource {
entity.setBulletinBoard(bulletinBoard); entity.setBulletinBoard(bulletinBoard);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------ // ------
@ -1385,7 +1385,7 @@ public class FlowResource extends ApplicationResource {
// get the specified processor status // get the specified processor status
final ProcessorStatusEntity entity = serviceFacade.getProcessorStatus(id); final ProcessorStatusEntity entity = serviceFacade.getProcessorStatus(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1458,7 +1458,7 @@ public class FlowResource extends ApplicationResource {
// get the specified input port status // get the specified input port status
final PortStatusEntity entity = serviceFacade.getInputPortStatus(id); final PortStatusEntity entity = serviceFacade.getInputPortStatus(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1531,7 +1531,7 @@ public class FlowResource extends ApplicationResource {
// get the specified output port status // get the specified output port status
final PortStatusEntity entity = serviceFacade.getOutputPortStatus(id); final PortStatusEntity entity = serviceFacade.getOutputPortStatus(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1604,7 +1604,7 @@ public class FlowResource extends ApplicationResource {
// get the specified remote process group status // get the specified remote process group status
final RemoteProcessGroupStatusEntity entity = serviceFacade.getRemoteProcessGroupStatus(id); final RemoteProcessGroupStatusEntity entity = serviceFacade.getRemoteProcessGroupStatus(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1685,7 +1685,7 @@ public class FlowResource extends ApplicationResource {
// get the status // get the status
final ProcessGroupStatusEntity entity = serviceFacade.getProcessGroupStatus(groupId, recursive); final ProcessGroupStatusEntity entity = serviceFacade.getProcessGroupStatus(groupId, recursive);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1758,7 +1758,7 @@ public class FlowResource extends ApplicationResource {
// get the specified connection status // get the specified connection status
final ConnectionStatusEntity entity = serviceFacade.getConnectionStatus(id); final ConnectionStatusEntity entity = serviceFacade.getConnectionStatus(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// -------------- // --------------
@ -1808,7 +1808,7 @@ public class FlowResource extends ApplicationResource {
// get the specified processor status history // get the specified processor status history
final StatusHistoryEntity entity = serviceFacade.getProcessorStatusHistory(id); final StatusHistoryEntity entity = serviceFacade.getProcessorStatusHistory(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1854,7 +1854,7 @@ public class FlowResource extends ApplicationResource {
// get the specified processor status history // get the specified processor status history
final StatusHistoryEntity entity = serviceFacade.getProcessGroupStatusHistory(groupId); final StatusHistoryEntity entity = serviceFacade.getProcessGroupStatusHistory(groupId);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1900,7 +1900,7 @@ public class FlowResource extends ApplicationResource {
// get the specified processor status history // get the specified processor status history
final StatusHistoryEntity entity = serviceFacade.getRemoteProcessGroupStatusHistory(id); final StatusHistoryEntity entity = serviceFacade.getRemoteProcessGroupStatusHistory(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -1946,7 +1946,7 @@ public class FlowResource extends ApplicationResource {
// get the specified processor status history // get the specified processor status history
final StatusHistoryEntity entity = serviceFacade.getConnectionStatusHistory(id); final StatusHistoryEntity entity = serviceFacade.getConnectionStatusHistory(id);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------- // -------
@ -2308,7 +2308,7 @@ public class FlowResource extends ApplicationResource {
entity.setGenerated(new Date()); entity.setGenerated(new Date());
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// -------------------- // --------------------

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

@ -135,7 +135,7 @@ public class FunnelResource extends ApplicationResource {
final FunnelEntity entity = serviceFacade.getFunnel(id); final FunnelEntity entity = serviceFacade.getFunnel(id);
populateRemainingFunnelEntityContent(entity); populateRemainingFunnelEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -220,7 +220,7 @@ public class FunnelResource extends ApplicationResource {
final FunnelEntity entity = serviceFacade.updateFunnel(revision, funnelEntity.getComponent()); final FunnelEntity entity = serviceFacade.updateFunnel(revision, funnelEntity.getComponent());
populateRemainingFunnelEntityContent(entity); populateRemainingFunnelEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -302,7 +302,7 @@ public class FunnelResource extends ApplicationResource {
(revision, funnelEntity) -> { (revision, funnelEntity) -> {
// delete the specified funnel // delete the specified funnel
final FunnelEntity entity = serviceFacade.deleteFunnel(revision, funnelEntity.getId()); final FunnelEntity entity = serviceFacade.deleteFunnel(revision, funnelEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -135,7 +135,7 @@ public class InputPortResource extends ApplicationResource {
final PortEntity entity = serviceFacade.getInputPort(id); final PortEntity entity = serviceFacade.getInputPort(id);
populateRemainingInputPortEntityContent(entity); populateRemainingInputPortEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -222,7 +222,7 @@ public class InputPortResource extends ApplicationResource {
final PortEntity entity = serviceFacade.updateInputPort(revision, portDTO); final PortEntity entity = serviceFacade.updateInputPort(revision, portDTO);
populateRemainingInputPortEntityContent(entity); populateRemainingInputPortEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -301,7 +301,7 @@ public class InputPortResource extends ApplicationResource {
(revision, portEntity) -> { (revision, portEntity) -> {
// delete the specified input port // delete the specified input port
final PortEntity entity = serviceFacade.deleteInputPort(revision, portEntity.getId()); final PortEntity entity = serviceFacade.deleteInputPort(revision, portEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -135,7 +135,7 @@ public class LabelResource extends ApplicationResource {
final LabelEntity entity = serviceFacade.getLabel(id); final LabelEntity entity = serviceFacade.getLabel(id);
populateRemainingLabelEntityContent(entity); populateRemainingLabelEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -222,7 +222,7 @@ public class LabelResource extends ApplicationResource {
final LabelEntity entity = serviceFacade.updateLabel(revision, labelDTO); final LabelEntity entity = serviceFacade.updateLabel(revision, labelDTO);
populateRemainingLabelEntityContent(entity); populateRemainingLabelEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -301,7 +301,7 @@ public class LabelResource extends ApplicationResource {
(revision, labelEntity) -> { (revision, labelEntity) -> {
// delete the specified label // delete the specified label
final LabelEntity entity = serviceFacade.deleteLabel(revision, labelEntity.getId()); final LabelEntity entity = serviceFacade.deleteLabel(revision, labelEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -135,7 +135,7 @@ public class OutputPortResource extends ApplicationResource {
final PortEntity entity = serviceFacade.getOutputPort(id); final PortEntity entity = serviceFacade.getOutputPort(id);
populateRemainingOutputPortEntityContent(entity); populateRemainingOutputPortEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -222,7 +222,7 @@ public class OutputPortResource extends ApplicationResource {
final PortEntity entity = serviceFacade.updateOutputPort(revision, portDTO); final PortEntity entity = serviceFacade.updateOutputPort(revision, portDTO);
populateRemainingOutputPortEntityContent(entity); populateRemainingOutputPortEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -301,7 +301,7 @@ public class OutputPortResource extends ApplicationResource {
(revision, portEntity) -> { (revision, portEntity) -> {
// delete the specified output port // delete the specified output port
final PortEntity entity = serviceFacade.deleteOutputPort(revision, portEntity.getId()); final PortEntity entity = serviceFacade.deleteOutputPort(revision, portEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

48
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

@ -236,7 +236,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.getComponent().setContents(null); entity.getComponent().setContents(null);
} }
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -321,7 +321,7 @@ public class ProcessGroupResource extends ApplicationResource {
final ProcessGroupEntity entity = serviceFacade.updateProcessGroup(revision, processGroupEntity.getComponent()); final ProcessGroupEntity entity = serviceFacade.updateProcessGroup(revision, processGroupEntity.getComponent());
populateRemainingProcessGroupEntityContent(entity); populateRemainingProcessGroupEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -410,7 +410,7 @@ public class ProcessGroupResource extends ApplicationResource {
final ProcessGroupEntity entity = serviceFacade.deleteProcessGroup(revision, processGroupEntity.getId()); final ProcessGroupEntity entity = serviceFacade.deleteProcessGroup(revision, processGroupEntity.getId());
// create the response // create the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -503,7 +503,7 @@ public class ProcessGroupResource extends ApplicationResource {
// generate a 201 created response // generate a 201 created response
String uri = entity.getUri(); String uri = entity.getUri();
return clusterContext(generateCreatedResponse(URI.create(uri), entity)).build(); return generateCreatedResponse(URI.create(uri), entity).build();
} }
); );
} }
@ -565,7 +565,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setProcessGroups(populateRemainingProcessGroupEntitiesContent(entities)); entity.setProcessGroups(populateRemainingProcessGroupEntitiesContent(entities));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ---------- // ----------
@ -689,7 +689,7 @@ public class ProcessGroupResource extends ApplicationResource {
// generate a 201 created response // generate a 201 created response
String uri = entity.getUri(); String uri = entity.getUri();
return clusterContext(generateCreatedResponse(URI.create(uri), entity)).build(); return generateCreatedResponse(URI.create(uri), entity).build();
} }
); );
} }
@ -745,7 +745,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setProcessors(processorResource.populateRemainingProcessorEntitiesContent(processors)); entity.setProcessors(processorResource.populateRemainingProcessorEntitiesContent(processors));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ----------- // -----------
@ -839,7 +839,7 @@ public class ProcessGroupResource extends ApplicationResource {
inputPortResource.populateRemainingInputPortEntityContent(entity); inputPortResource.populateRemainingInputPortEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -893,7 +893,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setInputPorts(inputPortResource.populateRemainingInputPortEntitiesContent(inputPorts)); entity.setInputPorts(inputPortResource.populateRemainingInputPortEntitiesContent(inputPorts));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------------ // ------------
@ -987,7 +987,7 @@ public class ProcessGroupResource extends ApplicationResource {
outputPortResource.populateRemainingOutputPortEntityContent(entity); outputPortResource.populateRemainingOutputPortEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -1042,7 +1042,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setOutputPorts(outputPortResource.populateRemainingOutputPortEntitiesContent(outputPorts)); entity.setOutputPorts(outputPortResource.populateRemainingOutputPortEntitiesContent(outputPorts));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------- // -------
@ -1136,7 +1136,7 @@ public class ProcessGroupResource extends ApplicationResource {
funnelResource.populateRemainingFunnelEntityContent(entity); funnelResource.populateRemainingFunnelEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -1191,7 +1191,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setFunnels(funnelResource.populateRemainingFunnelEntitiesContent(funnels)); entity.setFunnels(funnelResource.populateRemainingFunnelEntitiesContent(funnels));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ------ // ------
@ -1285,7 +1285,7 @@ public class ProcessGroupResource extends ApplicationResource {
labelResource.populateRemainingLabelEntityContent(entity); labelResource.populateRemainingLabelEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -1340,7 +1340,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setLabels(labelResource.populateRemainingLabelEntitiesContent(labels)); entity.setLabels(labelResource.populateRemainingLabelEntitiesContent(labels));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// --------------------- // ---------------------
@ -1449,7 +1449,7 @@ public class ProcessGroupResource extends ApplicationResource {
final RemoteProcessGroupEntity entity = serviceFacade.createRemoteProcessGroup(revision, groupId, remoteProcessGroupDTO); final RemoteProcessGroupEntity entity = serviceFacade.createRemoteProcessGroup(revision, groupId, remoteProcessGroupDTO);
remoteProcessGroupResource.populateRemainingRemoteProcessGroupEntityContent(entity); remoteProcessGroupResource.populateRemainingRemoteProcessGroupEntityContent(entity);
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -1511,7 +1511,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setRemoteProcessGroups(remoteProcessGroupResource.populateRemainingRemoteProcessGroupEntitiesContent(remoteProcessGroups)); entity.setRemoteProcessGroups(remoteProcessGroupResource.populateRemainingRemoteProcessGroupEntitiesContent(remoteProcessGroups));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ----------- // -----------
@ -1677,7 +1677,7 @@ public class ProcessGroupResource extends ApplicationResource {
// extract the href and build the response // extract the href and build the response
String uri = entity.getUri(); String uri = entity.getUri();
return clusterContext(generateCreatedResponse(URI.create(uri), entity)).build(); return generateCreatedResponse(URI.create(uri), entity).build();
} }
); );
} }
@ -1732,7 +1732,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setConnections(connectionResource.populateRemainingConnectionEntitiesContent(connections)); entity.setConnections(connectionResource.populateRemainingConnectionEntitiesContent(connections));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// ---------------- // ----------------
@ -1838,7 +1838,7 @@ public class ProcessGroupResource extends ApplicationResource {
populateRemainingSnippetContent(flow); populateRemainingSnippetContent(flow);
// generate the response // generate the response
return clusterContext(generateCreatedResponse(getAbsolutePath(), flowEntity)).build(); return generateCreatedResponse(getAbsolutePath(), flowEntity).build();
} }
); );
} }
@ -2009,7 +2009,7 @@ public class ProcessGroupResource extends ApplicationResource {
populateRemainingSnippetContent(flowSnippet); populateRemainingSnippetContent(flowSnippet);
// generate the response // generate the response
return clusterContext(generateCreatedResponse(getAbsolutePath(), entity)).build(); return generateCreatedResponse(getAbsolutePath(), entity).build();
} }
); );
} }
@ -2096,7 +2096,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setTemplate(template); entity.setTemplate(template);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(template.getUri()), entity)).build(); return generateCreatedResponse(URI.create(template.getUri()), entity).build();
} }
); );
} }
@ -2251,7 +2251,7 @@ public class ProcessGroupResource extends ApplicationResource {
entity.setTemplate(template); entity.setTemplate(template);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(template.getUri()), entity)).build(); return generateCreatedResponse(URI.create(template.getUri()), entity).build();
} catch (IllegalArgumentException | IllegalStateException e) { } catch (IllegalArgumentException | IllegalStateException e) {
logger.info("Unable to import template: " + e); logger.info("Unable to import template: " + e);
String responseXml = String.format("<errorResponse status=\"%s\" statusText=\"%s\"/>", Response.Status.BAD_REQUEST.getStatusCode(), e.getMessage()); String responseXml = String.format("<errorResponse status=\"%s\" statusText=\"%s\"/>", Response.Status.BAD_REQUEST.getStatusCode(), e.getMessage());
@ -2377,7 +2377,7 @@ public class ProcessGroupResource extends ApplicationResource {
controllerServiceResource.populateRemainingControllerServiceEntityContent(entity); controllerServiceResource.populateRemainingControllerServiceEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }

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

@ -189,7 +189,7 @@ public class ProcessorResource extends ApplicationResource {
populateRemainingProcessorEntityContent(entity); populateRemainingProcessorEntityContent(entity);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -260,7 +260,7 @@ public class ProcessorResource extends ApplicationResource {
entity.setPropertyDescriptor(descriptor); entity.setPropertyDescriptor(descriptor);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -315,7 +315,7 @@ public class ProcessorResource extends ApplicationResource {
entity.setComponentState(state); entity.setComponentState(state);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -377,7 +377,7 @@ public class ProcessorResource extends ApplicationResource {
final ComponentStateEntity entity = new ComponentStateEntity(); final ComponentStateEntity entity = new ComponentStateEntity();
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -475,7 +475,7 @@ public class ProcessorResource extends ApplicationResource {
final ProcessorEntity entity = serviceFacade.updateProcessor(revision, processorDTO); final ProcessorEntity entity = serviceFacade.updateProcessor(revision, processorDTO);
populateRemainingProcessorEntityContent(entity); populateRemainingProcessorEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -560,7 +560,7 @@ public class ProcessorResource extends ApplicationResource {
final ProcessorEntity entity = serviceFacade.deleteProcessor(revision, processorEntity.getId()); final ProcessorEntity entity = serviceFacade.deleteProcessor(revision, processorEntity.getId());
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -300,7 +300,7 @@ public class ProvenanceEventResource extends ApplicationResource {
entity.setProvenanceEvent(event); entity.setProvenanceEvent(event);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -376,7 +376,7 @@ public class ProvenanceEventResource extends ApplicationResource {
// generate the response // generate the response
URI uri = URI.create(generateResourceUri("provenance-events", event.getId())); URI uri = URI.create(generateResourceUri("provenance-events", event.getId()));
return clusterContext(generateCreatedResponse(uri, entity)).build(); return generateCreatedResponse(uri, entity).build();
} }
// setters // setters

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

@ -168,7 +168,7 @@ public class ProvenanceResource extends ApplicationResource {
entity.setProvenanceOptions(searchOptions); entity.setProvenanceOptions(searchOptions);
// generate the response // generate the response
return clusterContext(noCache(Response.ok(entity))).build(); return noCache(Response.ok(entity)).build();
} }
/** /**
@ -266,7 +266,7 @@ public class ProvenanceResource extends ApplicationResource {
entity.setProvenance(dto); entity.setProvenance(dto);
// generate the response // generate the response
return clusterContext(generateCreatedResponse(URI.create(dto.getUri()), entity)).build(); return generateCreatedResponse(URI.create(dto.getUri()), entity).build();
} }
); );
} }
@ -345,7 +345,7 @@ public class ProvenanceResource extends ApplicationResource {
entity.setProvenance(dto); entity.setProvenance(dto);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -413,7 +413,7 @@ public class ProvenanceResource extends ApplicationResource {
serviceFacade.deleteProvenance(entity.getId()); serviceFacade.deleteProvenance(entity.getId());
// generate the response // generate the response
return clusterContext(generateOkResponse(new ProvenanceEntity())).build(); return generateOkResponse(new ProvenanceEntity()).build();
} }
); );
} }
@ -521,7 +521,7 @@ public class ProvenanceResource extends ApplicationResource {
entity.setLineage(dto); entity.setLineage(dto);
// generate the response // generate the response
return clusterContext(generateCreatedResponse(URI.create(dto.getUri()), entity)).build(); return generateCreatedResponse(URI.create(dto.getUri()), entity).build();
} }
); );
} }
@ -582,7 +582,7 @@ public class ProvenanceResource extends ApplicationResource {
entity.setLineage(dto); entity.setLineage(dto);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -644,7 +644,7 @@ public class ProvenanceResource extends ApplicationResource {
serviceFacade.deleteLineage(entity.getId()); serviceFacade.deleteLineage(entity.getId());
// generate the response // generate the response
return clusterContext(generateOkResponse(new LineageEntity())).build(); return generateOkResponse(new LineageEntity()).build();
} }
); );
} }

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

@ -139,7 +139,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
final RemoteProcessGroupEntity entity = serviceFacade.getRemoteProcessGroup(id); final RemoteProcessGroupEntity entity = serviceFacade.getRemoteProcessGroup(id);
populateRemainingRemoteProcessGroupEntityContent(entity); populateRemainingRemoteProcessGroupEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -215,7 +215,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
() -> serviceFacade.verifyDeleteRemoteProcessGroup(id), () -> serviceFacade.verifyDeleteRemoteProcessGroup(id),
(revision, remoteProcessGroupEntity) -> { (revision, remoteProcessGroupEntity) -> {
final RemoteProcessGroupEntity entity = serviceFacade.deleteRemoteProcessGroup(revision, remoteProcessGroupEntity.getId()); final RemoteProcessGroupEntity entity = serviceFacade.deleteRemoteProcessGroup(revision, remoteProcessGroupEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -316,7 +316,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
entity.setRevision(updatedRevision); entity.setRevision(updatedRevision);
entity.setRemoteProcessGroupPort(controllerResponse.getRemoteProcessGroupPort()); entity.setRemoteProcessGroupPort(controllerResponse.getRemoteProcessGroupPort());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -418,7 +418,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
entity.setRevision(updatedRevision); entity.setRevision(updatedRevision);
entity.setRemoteProcessGroupPort(controllerResponse.getRemoteProcessGroupPort()); entity.setRemoteProcessGroupPort(controllerResponse.getRemoteProcessGroupPort());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -539,7 +539,7 @@ public class RemoteProcessGroupResource extends ApplicationResource {
final RemoteProcessGroupEntity entity = serviceFacade.updateRemoteProcessGroup(revision, remoteProcessGroup); final RemoteProcessGroupEntity entity = serviceFacade.updateRemoteProcessGroup(revision, remoteProcessGroup);
populateRemainingRemoteProcessGroupEntityContent(entity); populateRemainingRemoteProcessGroupEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -175,7 +175,7 @@ public class ReportingTaskResource extends ApplicationResource {
final ReportingTaskEntity reportingTask = serviceFacade.getReportingTask(id); final ReportingTaskEntity reportingTask = serviceFacade.getReportingTask(id);
populateRemainingReportingTaskEntityContent(reportingTask); populateRemainingReportingTaskEntityContent(reportingTask);
return clusterContext(generateOkResponse(reportingTask)).build(); return generateOkResponse(reportingTask).build();
} }
/** /**
@ -240,7 +240,7 @@ public class ReportingTaskResource extends ApplicationResource {
entity.setPropertyDescriptor(descriptor); entity.setPropertyDescriptor(descriptor);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -294,7 +294,7 @@ public class ReportingTaskResource extends ApplicationResource {
entity.setComponentState(state); entity.setComponentState(state);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -355,7 +355,7 @@ public class ReportingTaskResource extends ApplicationResource {
final ComponentStateEntity entity = new ComponentStateEntity(); final ComponentStateEntity entity = new ComponentStateEntity();
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -442,7 +442,7 @@ public class ReportingTaskResource extends ApplicationResource {
final ReportingTaskEntity entity = serviceFacade.updateReportingTask(revision, reportingTaskDTO); final ReportingTaskEntity entity = serviceFacade.updateReportingTask(revision, reportingTaskDTO);
populateRemainingReportingTaskEntityContent(entity); populateRemainingReportingTaskEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -528,7 +528,7 @@ public class ReportingTaskResource extends ApplicationResource {
(revision, reportingTaskEntity) -> { (revision, reportingTaskEntity) -> {
// delete the specified reporting task // delete the specified reporting task
final ReportingTaskEntity entity = serviceFacade.deleteReportingTask(revision, reportingTaskEntity.getId()); final ReportingTaskEntity entity = serviceFacade.deleteReportingTask(revision, reportingTaskEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -123,7 +123,7 @@ public class ResourceResource extends ApplicationResource {
entity.setResources(resources); entity.setResources(resources);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// setters // setters

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

@ -173,7 +173,7 @@ public class SiteToSiteResource extends ApplicationResource {
} }
// generate the response // generate the response
return clusterContext(noCache(Response.ok(entity))).build(); return noCache(Response.ok(entity)).build();
} }
/** /**
@ -263,7 +263,7 @@ public class SiteToSiteResource extends ApplicationResource {
final PeersEntity entity = new PeersEntity(); final PeersEntity entity = new PeersEntity();
entity.setPeers(peers); entity.setPeers(peers);
return clusterContext(noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager))).build(); return noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager)).build();
} }
// setters // setters

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

@ -199,7 +199,7 @@ public class SnippetResource extends ApplicationResource {
populateRemainingSnippetEntityContent(entity); populateRemainingSnippetEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getSnippet().getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getSnippet().getUri()), entity).build();
} }
); );
} }
@ -281,7 +281,7 @@ public class SnippetResource extends ApplicationResource {
// update the snippet // update the snippet
final SnippetEntity entity = serviceFacade.updateSnippet(revisions, snippetEntity.getSnippet()); final SnippetEntity entity = serviceFacade.updateSnippet(revisions, snippetEntity.getSnippet());
populateRemainingSnippetEntityContent(entity); populateRemainingSnippetEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -347,7 +347,7 @@ public class SnippetResource extends ApplicationResource {
(revisions, entity) -> { (revisions, entity) -> {
// delete the specified snippet // delete the specified snippet
final SnippetEntity snippetEntity = serviceFacade.deleteSnippet(revisions, entity.getId()); final SnippetEntity snippetEntity = serviceFacade.deleteSnippet(revisions, entity.getId());
return clusterContext(generateOkResponse(snippetEntity)).build(); return generateOkResponse(snippetEntity).build();
} }
); );
} }

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

@ -165,7 +165,7 @@ public class SystemDiagnosticsResource extends ApplicationResource {
entity.setSystemDiagnostics(systemDiagnosticsDto); entity.setSystemDiagnostics(systemDiagnosticsDto);
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
// setters // setters

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

@ -213,7 +213,7 @@ public class TemplateResource extends ApplicationResource {
// build the response entity // build the response entity
final TemplateEntity entity = new TemplateEntity(); final TemplateEntity entity = new TemplateEntity();
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

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

@ -194,7 +194,7 @@ public class TenantsResource extends ApplicationResource {
populateRemainingUserEntityContent(entity); populateRemainingUserEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -252,7 +252,7 @@ public class TenantsResource extends ApplicationResource {
final UserEntity entity = serviceFacade.getUser(id); final UserEntity entity = serviceFacade.getUser(id);
populateRemainingUserEntityContent(entity); populateRemainingUserEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -307,7 +307,7 @@ public class TenantsResource extends ApplicationResource {
entity.setUsers(populateRemainingUserEntitiesContent(users)); entity.setUsers(populateRemainingUserEntitiesContent(users));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -391,7 +391,7 @@ public class TenantsResource extends ApplicationResource {
final UserEntity entity = serviceFacade.updateUser(revision, userEntity.getComponent()); final UserEntity entity = serviceFacade.updateUser(revision, userEntity.getComponent());
populateRemainingUserEntityContent(entity); populateRemainingUserEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -473,7 +473,7 @@ public class TenantsResource extends ApplicationResource {
(revision, userEntity) -> { (revision, userEntity) -> {
// delete the specified user // delete the specified user
final UserEntity entity = serviceFacade.deleteUser(revision, userEntity.getId()); final UserEntity entity = serviceFacade.deleteUser(revision, userEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -583,7 +583,7 @@ public class TenantsResource extends ApplicationResource {
populateRemainingUserGroupEntityContent(entity); populateRemainingUserGroupEntityContent(entity);
// build the response // build the response
return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); return generateCreatedResponse(URI.create(entity.getUri()), entity).build();
} }
); );
} }
@ -641,7 +641,7 @@ public class TenantsResource extends ApplicationResource {
final UserGroupEntity entity = serviceFacade.getUserGroup(id); final UserGroupEntity entity = serviceFacade.getUserGroup(id);
populateRemainingUserGroupEntityContent(entity); populateRemainingUserGroupEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -695,7 +695,7 @@ public class TenantsResource extends ApplicationResource {
entity.setUserGroups(populateRemainingUserGroupEntitiesContent(users)); entity.setUserGroups(populateRemainingUserGroupEntitiesContent(users));
// generate the response // generate the response
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
/** /**
@ -779,7 +779,7 @@ public class TenantsResource extends ApplicationResource {
final UserGroupEntity entity = serviceFacade.updateUserGroup(revision, userGroupEntity.getComponent()); final UserGroupEntity entity = serviceFacade.updateUserGroup(revision, userGroupEntity.getComponent());
populateRemainingUserGroupEntityContent(entity); populateRemainingUserGroupEntityContent(entity);
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }
@ -861,7 +861,7 @@ public class TenantsResource extends ApplicationResource {
(revision, userGroupEntity) -> { (revision, userGroupEntity) -> {
// delete the specified user group // delete the specified user group
final UserGroupEntity entity = serviceFacade.deleteUserGroup(revision, userGroupEntity.getId()); final UserGroupEntity entity = serviceFacade.deleteUserGroup(revision, userGroupEntity.getId());
return clusterContext(generateOkResponse(entity)).build(); return generateOkResponse(entity).build();
} }
); );
} }

13
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
View File

@ -17,7 +17,18 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<% String contextPath = "/".equals(request.getContextPath()) ? "" : request.getContextPath(); %> <%
String contextPath = request.getHeader("X-ProxyContextPath");
if (contextPath == null) {
contextPath = request.getHeader("X-Forwarded-Context");
}
if (contextPath == null) {
contextPath = "";
}
if (contextPath.endsWith("/")) {
contextPath = contextPath.substring(0, contextPath.length() - 1);
}
%>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<%= contextPath %>/nifi/images/nifi16.ico"/> <link rel="shortcut icon" href="<%= contextPath %>/nifi/images/nifi16.ico"/>

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
View File

@ -17,16 +17,28 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<%
String contextPath = request.getHeader("X-ProxyContextPath");
if (contextPath == null) {
contextPath = request.getHeader("X-Forwarded-Context");
}
if (contextPath == null) {
contextPath = "";
}
if (contextPath.endsWith("/")) {
contextPath = contextPath.substring(0, contextPath.length() - 1);
}
%>
<head> <head>
<title><%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %></title> <title><%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="images/nifi16.ico"/> <link rel="shortcut icon" href="images/nifi16.ico"/>
<link rel="stylesheet" href="/nifi/assets/reset.css/reset.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/assets/reset.css/reset.css" type="text/css" />
<link rel="stylesheet" href="/nifi/css/common-ui.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/css/common-ui.css" type="text/css" />
<link rel="stylesheet" href="/nifi/fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/fonts/flowfont/flowfont.css" type="text/css" />
<link rel="stylesheet" href="/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<link rel="stylesheet" href="/nifi/css/message-pane.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-pane.css" type="text/css" />
<link rel="stylesheet" href="/nifi/css/message-page.css" type="text/css" /> <link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-page.css" type="text/css" />
</head> </head>
<body class="message-pane"> <body class="message-pane">

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
View File

@ -86,15 +86,15 @@
// handle logout // handle logout
$('#user-logout').on('click', function () { $('#user-logout').on('click', function () {
nfStorage.removeItem('jwt'); nfStorage.removeItem('jwt');
window.location = '/nifi/login'; window.location = '../nifi/login';
}); });
// handle home // handle home
$('#user-home').on('click', function () { $('#user-home').on('click', function () {
if (top !== window) { if (top !== window) {
parent.window.location = '/nifi'; parent.window.location = '../nifi';
} else { } else {
window.location = '/nifi'; window.location = '../nifi';
} }
}); });
}); });

2
nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>CreateHadoopSequenceFile</title> <title>CreateHadoopSequenceFile</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/resources/docs/org.apache.nifi.jms.cf.JMSConnectionFactoryProvider/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>JMSConnectionFactoryProvider</title> <title>JMSConnectionFactoryProvider</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeJMS</title> <title>ConsumeJMS</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PublishJMS</title> <title>PublishJMS</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafkaRecord_0_10/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeKafka</title> <title>ConsumeKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka_0_10/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeKafka</title> <title>ConsumeKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafkaRecord_0_10/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PublishKafka</title> <title>PublishKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka_0_10/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PublishKafka</title> <title>PublishKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>GetKafka</title> <title>GetKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PutKafka</title> <title>PutKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConsumeKafka</title> <title>ConsumeKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PublishKafka</title> <title>PublishKafka</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/resources/docs/org.apache.nifi.processors.kite.ConvertAvroSchema/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ConvertAvroSchema</title> <title>ConvertAvroSchema</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>SiteToSiteProvenanceReportingTask</title> <title>SiteToSiteProvenanceReportingTask</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/resources/docs/org.apache.nifi.processors.slack.PutSlack/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PutSlack</title> <title>PutSlack</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>GetSNMP</title> <title>GetSNMP</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>SetSNMP</title> <title>SetSNMP</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/resources/docs/org.apache.nifi.processors.solr.PutSolrContentStream/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PutSolrContentStream</title> <title>PutSolrContentStream</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>SpringContextProcessor</title> <title>SpringContextProcessor</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DebugFlow/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>DebugFlow</title> <title>DebugFlow</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>EncryptContent</title> <title>EncryptContent</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateJsonPath/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>EvaluateJsonPath</title> <title>EvaluateJsonPath</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>EvaluateXQuery</title> <title>EvaluateXQuery</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" <link rel="stylesheet" href="../../../../../css/component-usage.css"
type="text/css" /> type="text/css" />
</head> </head>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpRequest/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>HandleHttpRequest</title> <title>HandleHttpRequest</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpResponse/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>HandleHttpResponse</title> <title>HandleHttpResponse</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>IdentifyMimeType</title> <title>IdentifyMimeType</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.JoltTransformJSON/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>JoltTransformJSON</title> <title>JoltTransformJSON</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

4
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PartitionRecord/additionalDetails.html
View File

@ -18,14 +18,14 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>PartitionRecord</title> <title>PartitionRecord</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>
<p> <p>
PartitionRecord allows the user to separate out records in a FlowFile such that each outgoing FlowFile PartitionRecord allows the user to separate out records in a FlowFile such that each outgoing FlowFile
consists only of records that are "alike." To define what it means for two records to be alike, the Processor consists only of records that are "alike." To define what it means for two records to be alike, the Processor
makes use of NiFi's <a href="/nifi-docs/html/record-path-guide.html">RecordPath</a> DSL. makes use of NiFi's <a href="../../../../../html/record-path-guide.html">RecordPath</a> DSL.
</p> </p>
<p> <p>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.QueryRecord/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>QueryRecord</title> <title>QueryRecord</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>RouteOnAttribute</title> <title>RouteOnAttribute</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>TailFile</title> <title>TailFile</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

6
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UpdateRecord/additionalDetails.html
View File

@ -18,12 +18,12 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>UpdateRecord</title> <title>UpdateRecord</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>
<p> <p>
UpdateRecord makes use of the NiFi <a href="/nifi-docs/html/record-path-guide.html"> UpdateRecord makes use of the NiFi <a href="../../../../../html/record-path-guide.html">
RecordPath Domain-Specific Language (DSL)</a> to allow the user RecordPath Domain-Specific Language (DSL)</a> to allow the user
to indicate which field(s) in the Record should be updated. Users do this by adding a User-defined to indicate which field(s) in the Record should be updated. Users do this by adding a User-defined
Property to the Processor's configuration. The name of the User-defined Property must be the Property to the Processor's configuration. The name of the User-defined Property must be the
@ -47,7 +47,7 @@
match will be updated. If the replacement value is itself a RecordPath that does not match, then a match will be updated. If the replacement value is itself a RecordPath that does not match, then a
<code>null</code> value will be set for the field. For instances where this is not the desired behavior, <code>null</code> value will be set for the field. For instances where this is not the desired behavior,
RecordPath predicates can be used to filter the fields that match so that no fields will be selected. RecordPath predicates can be used to filter the fields that match so that no fields will be selected.
See <a href="/nifi-docs/html/record-path-guide.html#predicates">RecordPath Predicates</a> for more information. See <a href="../../../../../html/record-path-guide.html#predicates">RecordPath Predicates</a> for more information.
</p> </p>
<p> <p>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateCsv/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>ValidateCsv</title> <title>ValidateCsv</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ControllerStatusReportingTask</title> <title>ControllerStatusReportingTask</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>StandardGangliaReporter</title> <title>StandardGangliaReporter</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/resources/docs/org.apache.nifi.lookup.maxmind.IPLookupService/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>IPLookupService</title> <title>IPLookupService</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/resources/docs/org.apache.nifi.csv.CSVReader/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>CSVReader</title> <title>CSVReader</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/resources/docs/org.apache.nifi.grok.GrokReader/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>GrokReader</title> <title>GrokReader</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/resources/docs/org.apache.nifi.json.JsonPathReader/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>JsonPathReader</title> <title>JsonPathReader</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/resources/docs/org.apache.nifi.json.JsonTreeReader/additionalDetails.html
View File

@ -17,7 +17,7 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>JsonTreeReader</title> <title>JsonTreeReader</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css"/> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css"/>
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>UpdateAttribute</title> <title>UpdateAttribute</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>

2
nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/main/resources/docs/org.apache.nifi.processors.windows.event.log.ConsumeWindowsEventLog/additionalDetails.html
View File

@ -18,7 +18,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>ParseEvtx</title> <title>ParseEvtx</title>
<link rel="stylesheet" href="/nifi-docs/css/component-usage.css" type="text/css" /> <link rel="stylesheet" href="../../../../../css/component-usage.css" type="text/css" />
</head> </head>
<body> <body>