diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html index 3c04cd43c6..49409cf7e8 100644 --- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html +++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html @@ -17,7 +17,7 @@ AmbariReportingTask - + diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.ConsumeAMQP/additionalDetails.html b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.ConsumeAMQP/additionalDetails.html index a7c0f7994c..f276eeb59a 100644 --- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.ConsumeAMQP/additionalDetails.html +++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.ConsumeAMQP/additionalDetails.html @@ -17,7 +17,7 @@ ConsumeAMQP - + diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.PublishAMQP/additionalDetails.html b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.PublishAMQP/additionalDetails.html index 1c8ccc6a7b..73453b69a4 100644 --- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.PublishAMQP/additionalDetails.html +++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/resources/docs/org.apache.nifi.amqp.processors.PublishAMQP/additionalDetails.html @@ -17,7 +17,7 @@ PublishAMQP - + diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/resources/docs/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash/additionalDetails.html b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/resources/docs/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash/additionalDetails.html index fe0f6bd5b3..ae2d5d3296 100644 --- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/resources/docs/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash/additionalDetails.html +++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/src/main/resources/docs/org/apache/nifi/processors/cybersecurity/CompareFuzzyHash/additionalDetails.html @@ -17,7 +17,7 @@ CompareFuzzyHash - diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html index 97312267ee..0672a88daa 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html @@ -17,7 +17,7 @@ DataDogReportingTask - + diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumeIMAP/additionalDetails.html b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumeIMAP/additionalDetails.html index 64f0949000..93f09f65ac 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumeIMAP/additionalDetails.html +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumeIMAP/additionalDetails.html @@ -17,7 +17,7 @@ ConsumeIMAP - diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumePOP3/additionalDetails.html b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumePOP3/additionalDetails.html index 0c553ad5df..f16557ee7b 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumePOP3/additionalDetails.html +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/resources/docs/org.apache.nifi.processors.email.ConsumePOP3/additionalDetails.html @@ -17,7 +17,7 @@ ConsumePOP3 - diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/resources/docs/org.apache.nifi.processors.evtx.ParseEvtx/additionalDetails.html b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/resources/docs/org.apache.nifi.processors.evtx.ParseEvtx/additionalDetails.html index 8a62ea4588..454cdb9746 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/resources/docs/org.apache.nifi.processors.evtx.ParseEvtx/additionalDetails.html +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/resources/docs/org.apache.nifi.processors.evtx.ParseEvtx/additionalDetails.html @@ -18,7 +18,7 @@ ParseEvtx - + diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSink/additionalDetails.html b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSink/additionalDetails.html index 9455ef6547..16ae4a7481 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSink/additionalDetails.html +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSink/additionalDetails.html @@ -17,7 +17,7 @@ ExecuteFlumeSink - + diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSource/additionalDetails.html b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSource/additionalDetails.html index d1c76b27ad..bb4c1359e5 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSource/additionalDetails.html +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/main/resources/docs/org.apache.nifi.processors.flume.ExecuteFlumeSource/additionalDetails.html @@ -17,7 +17,7 @@ ExecuteFlumeSource - + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java index 899af2ba04..7a39d19e56 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java @@ -100,7 +100,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter { xmlStreamWriter.writeStartElement("link"); 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.writeEndElement(); xmlStreamWriter.writeEndElement(); @@ -438,7 +438,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter { xmlStreamWriter.writeCharacters(", "); } 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) { 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 { xmlStreamWriter.writeCharacters(" "); 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("title", description); xmlStreamWriter.writeEndElement(); @@ -799,7 +799,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter { 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; } else { @@ -827,7 +827,7 @@ public class HtmlDocumentationWriter implements DocumentationWriter { final String id = firstCoordinate.getId(); 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; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java index 689ce7be01..2e7105867c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java @@ -162,7 +162,7 @@ public class AccessPolicyResource extends ApplicationResource { final AccessPolicyEntity entity = serviceFacade.getAccessPolicy(requestAction, resource); populateRemainingAccessPolicyEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ----------------------- @@ -255,7 +255,7 @@ public class AccessPolicyResource extends ApplicationResource { populateRemainingAccessPolicyEntityContent(entity); // 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); 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); populateRemainingAccessPolicyEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -484,7 +484,7 @@ public class AccessPolicyResource extends ApplicationResource { (revision, accessPolicyEntity) -> { // delete the specified access policy final AccessPolicyEntity entity = serviceFacade.deleteAccessPolicy(revision, accessPolicyEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java index 529f0498e2..9342c8fe19 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java @@ -122,7 +122,7 @@ public class AccessResource extends ApplicationResource { entity.setConfig(accessConfiguration); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java index a057da88ed..4ca503278b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java @@ -100,11 +100,17 @@ public abstract class ApplicationResource { public static final String VERSION = "version"; public static final String CLIENT_ID = "clientId"; + 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_PORT_HTTP_HEADER = "X-ProxyPort"; 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."; private static final Logger logger = LoggerFactory.getLogger(ApplicationResource.class); @@ -141,10 +147,10 @@ public abstract class ApplicationResource { try { // check for proxy settings - final String scheme = httpServletRequest.getHeader(PROXY_SCHEME_HTTP_HEADER); - final String host = httpServletRequest.getHeader(PROXY_HOST_HTTP_HEADER); - final String port = httpServletRequest.getHeader(PROXY_PORT_HTTP_HEADER); - String baseContextPath = httpServletRequest.getHeader(PROXY_CONTEXT_PATH_HTTP_HEADER); + final String scheme = getFirstHeaderValue(PROXY_SCHEME_HTTP_HEADER, FORWARDED_PROTO_HTTP_HEADER); + final String host = getFirstHeaderValue(PROXY_HOST_HTTP_HEADER, FORWARDED_HOST_HTTP_HEADER); + final String port = getFirstHeaderValue(PROXY_PORT_HTTP_HEADER, FORWARDED_PORT_HTTP_HEADER); + String baseContextPath = getFirstHeaderValue(PROXY_CONTEXT_PATH_HTTP_HEADER, FORWARDED_CONTEXT_HTTP_HEADER); // if necessary, prepend the context path String resourcePath = uri.getPath(); @@ -154,6 +160,10 @@ public abstract class ApplicationResource { baseContextPath = "/" + baseContextPath; } + if (baseContextPath.endsWith("/")) { + baseContextPath = StringUtils.substringBeforeLast(baseContextPath, "/"); + } + // determine the complete resource path resourcePath = baseContextPath + resourcePath; } @@ -202,18 +212,6 @@ public abstract class ApplicationResource { 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() { final Optional seed = getIdGenerationSeed(); UUID uuid; @@ -345,16 +343,20 @@ public abstract class ApplicationResource { } } - // set the proxy details to request details if not already set client - final String proxyScheme = httpServletRequest.getHeader(PROXY_SCHEME_HTTP_HEADER); + // if the scheme is not set by the client, include the details from this request but don't override + final String proxyScheme = getFirstHeaderValue(PROXY_SCHEME_HTTP_HEADER, FORWARDED_PROTO_HTTP_HEADER); if (proxyScheme == null) { 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) { 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) { result.put(PROXY_PORT_HTTP_HEADER, String.valueOf(httpServletRequest.getServerPort())); } @@ -362,6 +364,31 @@ public abstract class ApplicationResource { 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) * diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java index cfd65858b5..70046db912 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java @@ -143,7 +143,7 @@ public class ConnectionResource extends ApplicationResource { populateRemainingConnectionEntityContent(entity); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -272,7 +272,7 @@ public class ConnectionResource extends ApplicationResource { populateRemainingConnectionEntityContent(entity); // 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()); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java index 0a3b0e0d8f..a5acc6bff2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java @@ -168,7 +168,7 @@ public class ControllerResource extends ApplicationResource { } final ControllerConfigurationEntity entity = serviceFacade.getControllerConfiguration(); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -227,7 +227,7 @@ public class ControllerResource extends ApplicationResource { null, (revision, configEntity) -> { 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); // 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); // build the response - return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); + return generateCreatedResponse(URI.create(entity.getUri()), entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java index e4ee044085..6cbc2410ec 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java @@ -188,7 +188,7 @@ public class ControllerServiceResource extends ApplicationResource { final ControllerServiceEntity entity = serviceFacade.getControllerService(id); populateRemainingControllerServiceEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -253,7 +253,7 @@ public class ControllerServiceResource extends ApplicationResource { entity.setPropertyDescriptor(descriptor); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -307,7 +307,7 @@ public class ControllerServiceResource extends ApplicationResource { entity.setComponentState(state); // 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(); // 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 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( 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); populateRemainingControllerServiceEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -725,7 +725,7 @@ public class ControllerServiceResource extends ApplicationResource { (revision, controllerServiceEntity) -> { // delete the specified controller service final ControllerServiceEntity entity = serviceFacade.deleteControllerService(revision, controllerServiceEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java index 2a2c2b9f2e..c3f4a8df58 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java @@ -205,7 +205,7 @@ public class CountersResource extends ApplicationResource { entity.setCounters(countersReport); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -266,7 +266,7 @@ public class CountersResource extends ApplicationResource { entity.setCounter(counter); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java index d8a71dd171..897ff7ad9e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java @@ -473,13 +473,13 @@ public class DataTransferResource extends ApplicationResource { entity.setMessage(e.getMessage()); 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 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. // Above conditions can guarantee this is the latter case, we return 200 OK here. entity.setResponseCode(ResponseCode.CANCEL_TRANSACTION.getCode()); - return clusterContext(noCache(Response.ok(entity))).build(); + return noCache(Response.ok(entity)).build(); } else { return responseCreator.unexpectedErrorResponse(portId, transactionId, e); } @@ -592,7 +592,7 @@ public class DataTransferResource extends ApplicationResource { 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) { @@ -798,7 +798,7 @@ public class DataTransferResource extends ApplicationResource { final TransactionResultEntity entity = new TransactionResultEntity(); entity.setResponseCode(ResponseCode.CONTINUE_TRANSACTION.getCode()); 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) { return responseCreator.handshakeExceptionResponse(e); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java index 14f2108cbb..a4b96c985f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java @@ -256,7 +256,7 @@ public class FlowResource extends ApplicationResource { ) public Response generateClientId() { authorizeFlow(); - return clusterContext(generateOkResponse(generateUuid())).build(); + return generateOkResponse(generateUuid()).build(); } /** @@ -292,7 +292,7 @@ public class FlowResource extends ApplicationResource { } 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(); // 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 final ProcessGroupFlowEntity entity = serviceFacade.getProcessGroupFlow(groupId); populateRemainingFlowContent(entity.getProcessGroupFlow()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ------------------- @@ -424,7 +424,7 @@ public class FlowResource extends ApplicationResource { entity.setControllerServices(controllerServices); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -475,7 +475,7 @@ public class FlowResource extends ApplicationResource { entity.setControllerServices(controllerServices); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // --------------- @@ -523,7 +523,7 @@ public class FlowResource extends ApplicationResource { entity.setReportingTasks(reportingTasks); // 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 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); // 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); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -816,7 +816,7 @@ public class FlowResource extends ApplicationResource { entity.setClusterSummary(clusterConfiguration); // 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(); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -900,7 +900,7 @@ public class FlowResource extends ApplicationResource { entity.setBanners(bannerDTO); // 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -1042,7 +1042,7 @@ public class FlowResource extends ApplicationResource { bundleGroupFilter, bundleArtifactFilter, typeFilter)); // 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)); // 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()); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -1199,7 +1199,7 @@ public class FlowResource extends ApplicationResource { entity.setAbout(aboutDTO); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // -------------- @@ -1308,7 +1308,7 @@ public class FlowResource extends ApplicationResource { entity.setBulletinBoard(bulletinBoard); // 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 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 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 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 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 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 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 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 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 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 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()); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // -------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java index 811fc6139d..3547c1726c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java @@ -135,7 +135,7 @@ public class FunnelResource extends ApplicationResource { final FunnelEntity entity = serviceFacade.getFunnel(id); 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()); populateRemainingFunnelEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -302,7 +302,7 @@ public class FunnelResource extends ApplicationResource { (revision, funnelEntity) -> { // delete the specified funnel final FunnelEntity entity = serviceFacade.deleteFunnel(revision, funnelEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java index a5e8169322..536590074b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java @@ -135,7 +135,7 @@ public class InputPortResource extends ApplicationResource { final PortEntity entity = serviceFacade.getInputPort(id); 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); populateRemainingInputPortEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -301,7 +301,7 @@ public class InputPortResource extends ApplicationResource { (revision, portEntity) -> { // delete the specified input port final PortEntity entity = serviceFacade.deleteInputPort(revision, portEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java index fa6765728a..2816d25c01 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java @@ -135,7 +135,7 @@ public class LabelResource extends ApplicationResource { final LabelEntity entity = serviceFacade.getLabel(id); 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); populateRemainingLabelEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -301,7 +301,7 @@ public class LabelResource extends ApplicationResource { (revision, labelEntity) -> { // delete the specified label final LabelEntity entity = serviceFacade.deleteLabel(revision, labelEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java index c6cfac67b7..0c49b0a497 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java @@ -135,7 +135,7 @@ public class OutputPortResource extends ApplicationResource { final PortEntity entity = serviceFacade.getOutputPort(id); 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); populateRemainingOutputPortEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -301,7 +301,7 @@ public class OutputPortResource extends ApplicationResource { (revision, portEntity) -> { // delete the specified output port final PortEntity entity = serviceFacade.deleteOutputPort(revision, portEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index 1eb86fae50..5b3ba843e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -236,7 +236,7 @@ public class ProcessGroupResource extends ApplicationResource { 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()); 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()); // 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 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)); // 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 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ----------- @@ -839,7 +839,7 @@ public class ProcessGroupResource extends ApplicationResource { inputPortResource.populateRemainingInputPortEntityContent(entity); // 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ------------ @@ -987,7 +987,7 @@ public class ProcessGroupResource extends ApplicationResource { outputPortResource.populateRemainingOutputPortEntityContent(entity); // 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ------- @@ -1136,7 +1136,7 @@ public class ProcessGroupResource extends ApplicationResource { funnelResource.populateRemainingFunnelEntityContent(entity); // 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ------ @@ -1285,7 +1285,7 @@ public class ProcessGroupResource extends ApplicationResource { labelResource.populateRemainingLabelEntityContent(entity); // 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)); // 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); 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)); // 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 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)); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // ---------------- @@ -1838,7 +1838,7 @@ public class ProcessGroupResource extends ApplicationResource { populateRemainingSnippetContent(flow); // 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); // 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); // 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); // build the response - return clusterContext(generateCreatedResponse(URI.create(template.getUri()), entity)).build(); + return generateCreatedResponse(URI.create(template.getUri()), entity).build(); } catch (IllegalArgumentException | IllegalStateException e) { logger.info("Unable to import template: " + e); String responseXml = String.format("", Response.Status.BAD_REQUEST.getStatusCode(), e.getMessage()); @@ -2377,7 +2377,7 @@ public class ProcessGroupResource extends ApplicationResource { controllerServiceResource.populateRemainingControllerServiceEntityContent(entity); // build the response - return clusterContext(generateCreatedResponse(URI.create(entity.getUri()), entity)).build(); + return generateCreatedResponse(URI.create(entity.getUri()), entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java index 125fe90ad2..4c53ef7ba5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java @@ -189,7 +189,7 @@ public class ProcessorResource extends ApplicationResource { populateRemainingProcessorEntityContent(entity); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -260,7 +260,7 @@ public class ProcessorResource extends ApplicationResource { entity.setPropertyDescriptor(descriptor); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -315,7 +315,7 @@ public class ProcessorResource extends ApplicationResource { entity.setComponentState(state); // 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(); // 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); 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()); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java index 3da1fce890..55f78e8b24 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java @@ -300,7 +300,7 @@ public class ProvenanceEventResource extends ApplicationResource { entity.setProvenanceEvent(event); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -376,7 +376,7 @@ public class ProvenanceEventResource extends ApplicationResource { // generate the response URI uri = URI.create(generateResourceUri("provenance-events", event.getId())); - return clusterContext(generateCreatedResponse(uri, entity)).build(); + return generateCreatedResponse(uri, entity).build(); } // setters diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java index 2aff9ca455..e5b6cc2615 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java @@ -168,7 +168,7 @@ public class ProvenanceResource extends ApplicationResource { entity.setProvenanceOptions(searchOptions); // 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); // 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); // 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()); // 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); // 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); // 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()); // generate the response - return clusterContext(generateOkResponse(new LineageEntity())).build(); + return generateOkResponse(new LineageEntity()).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java index 0c192d7ea9..fbceee2c5c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java @@ -139,7 +139,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { final RemoteProcessGroupEntity entity = serviceFacade.getRemoteProcessGroup(id); populateRemainingRemoteProcessGroupEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -215,7 +215,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { () -> serviceFacade.verifyDeleteRemoteProcessGroup(id), (revision, remoteProcessGroupEntity) -> { 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.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.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); populateRemainingRemoteProcessGroupEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java index 72b44314d4..ad035fc0a1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -175,7 +175,7 @@ public class ReportingTaskResource extends ApplicationResource { final ReportingTaskEntity reportingTask = serviceFacade.getReportingTask(id); populateRemainingReportingTaskEntityContent(reportingTask); - return clusterContext(generateOkResponse(reportingTask)).build(); + return generateOkResponse(reportingTask).build(); } /** @@ -240,7 +240,7 @@ public class ReportingTaskResource extends ApplicationResource { entity.setPropertyDescriptor(descriptor); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -294,7 +294,7 @@ public class ReportingTaskResource extends ApplicationResource { entity.setComponentState(state); // 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(); // 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); populateRemainingReportingTaskEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -528,7 +528,7 @@ public class ReportingTaskResource extends ApplicationResource { (revision, reportingTaskEntity) -> { // delete the specified reporting task final ReportingTaskEntity entity = serviceFacade.deleteReportingTask(revision, reportingTaskEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java index 56c62bcc5c..1c91e5ed95 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java @@ -123,7 +123,7 @@ public class ResourceResource extends ApplicationResource { entity.setResources(resources); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // setters diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java index ce5b3276fb..fc6d4dddac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java @@ -173,7 +173,7 @@ public class SiteToSiteResource extends ApplicationResource { } // 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(); entity.setPeers(peers); - return clusterContext(noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager))).build(); + return noCache(setCommonHeaders(Response.ok(entity), transportProtocolVersion, transactionManager)).build(); } // setters diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java index 0be7218b61..5817cd73a3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java @@ -199,7 +199,7 @@ public class SnippetResource extends ApplicationResource { populateRemainingSnippetEntityContent(entity); // 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 final SnippetEntity entity = serviceFacade.updateSnippet(revisions, snippetEntity.getSnippet()); populateRemainingSnippetEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -347,7 +347,7 @@ public class SnippetResource extends ApplicationResource { (revisions, entity) -> { // delete the specified snippet final SnippetEntity snippetEntity = serviceFacade.deleteSnippet(revisions, entity.getId()); - return clusterContext(generateOkResponse(snippetEntity)).build(); + return generateOkResponse(snippetEntity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java index b000060fe7..063f96cd7e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java @@ -165,7 +165,7 @@ public class SystemDiagnosticsResource extends ApplicationResource { entity.setSystemDiagnostics(systemDiagnosticsDto); // generate the response - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } // setters diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java index 52b31a582d..36823f5dd2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java @@ -213,7 +213,7 @@ public class TemplateResource extends ApplicationResource { // build the response entity final TemplateEntity entity = new TemplateEntity(); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java index d489009649..46b3571331 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java @@ -194,7 +194,7 @@ public class TenantsResource extends ApplicationResource { populateRemainingUserEntityContent(entity); // 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); populateRemainingUserEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -307,7 +307,7 @@ public class TenantsResource extends ApplicationResource { entity.setUsers(populateRemainingUserEntitiesContent(users)); // 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()); populateRemainingUserEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -473,7 +473,7 @@ public class TenantsResource extends ApplicationResource { (revision, userEntity) -> { // delete the specified user 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); // 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); populateRemainingUserGroupEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } /** @@ -695,7 +695,7 @@ public class TenantsResource extends ApplicationResource { entity.setUserGroups(populateRemainingUserGroupEntitiesContent(users)); // 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()); populateRemainingUserGroupEntityContent(entity); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } @@ -861,7 +861,7 @@ public class TenantsResource extends ApplicationResource { (revision, userGroupEntity) -> { // delete the specified user group final UserGroupEntity entity = serviceFacade.deleteUserGroup(revision, userGroupEntity.getId()); - return clusterContext(generateOkResponse(entity)).build(); + return generateOkResponse(entity).build(); } ); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp index 7ffeb54eb7..e029a80d6c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp @@ -17,7 +17,18 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> - <% 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); + } + %> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp index 100a4ad1a5..98e5f45faf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp @@ -17,16 +17,28 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> + <% + 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); + } + %> <%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %> - - - - - - + + + + + + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js index 0bf7c38f56..b1e2decd62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js @@ -86,15 +86,15 @@ // handle logout $('#user-logout').on('click', function () { nfStorage.removeItem('jwt'); - window.location = '/nifi/login'; + window.location = '../nifi/login'; }); // handle home $('#user-home').on('click', function () { if (top !== window) { - parent.window.location = '/nifi'; + parent.window.location = '../nifi'; } else { - window.location = '/nifi'; + window.location = '../nifi'; } }); }); diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/additionalDetails.html b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/additionalDetails.html index a87c2a93fd..b8bf7c2d99 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/additionalDetails.html +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/resources/docs/org.apache.nifi.processors.hadoop.CreateHadoopSequenceFile/additionalDetails.html @@ -18,7 +18,7 @@ CreateHadoopSequenceFile - + diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/resources/docs/org.apache.nifi.jms.cf.JMSConnectionFactoryProvider/additionalDetails.html b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/resources/docs/org.apache.nifi.jms.cf.JMSConnectionFactoryProvider/additionalDetails.html index 84c87e8ba8..d1e1325402 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/resources/docs/org.apache.nifi.jms.cf.JMSConnectionFactoryProvider/additionalDetails.html +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/resources/docs/org.apache.nifi.jms.cf.JMSConnectionFactoryProvider/additionalDetails.html @@ -17,7 +17,7 @@ JMSConnectionFactoryProvider - + diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html index 953f60712c..ac40cec739 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.ConsumeJMS/additionalDetails.html @@ -17,7 +17,7 @@ ConsumeJMS - + diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html index 176d778d9f..a85b21c291 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html @@ -17,7 +17,7 @@ PublishJMS - + diff --git a/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 b/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 index 03a7482b2a..7992ca7d1f 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ ConsumeKafka - + diff --git a/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 b/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 index a8a86eb835..9bfb5a1181 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ ConsumeKafka - + diff --git a/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 b/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 index f997a49a76..b2441c7b2c 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ PublishKafka - + diff --git a/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 b/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 index 119eb93ecf..06aa5c27d6 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ PublishKafka - + diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/additionalDetails.html index 7261f9bdee..76910eb3ce 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/additionalDetails.html +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.GetKafka/additionalDetails.html @@ -17,7 +17,7 @@ GetKafka - + diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/additionalDetails.html index 1a0b379c09..3b8ae94e9f 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/additionalDetails.html +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.PutKafka/additionalDetails.html @@ -17,7 +17,7 @@ PutKafka - + diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka/additionalDetails.html index a838ff693a..e22bac769e 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka/additionalDetails.html +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.ConsumeKafka/additionalDetails.html @@ -17,7 +17,7 @@ ConsumeKafka - + diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html index 1dd85b3051..1aa733798d 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html @@ -17,7 +17,7 @@ PublishKafka - + diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/resources/docs/org.apache.nifi.processors.kite.ConvertAvroSchema/additionalDetails.html b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/resources/docs/org.apache.nifi.processors.kite.ConvertAvroSchema/additionalDetails.html index 64aeefaadc..27ad80381e 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/resources/docs/org.apache.nifi.processors.kite.ConvertAvroSchema/additionalDetails.html +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/resources/docs/org.apache.nifi.processors.kite.ConvertAvroSchema/additionalDetails.html @@ -18,7 +18,7 @@ ConvertAvroSchema - + diff --git a/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 b/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 index 7e8204c73d..e1841b2c77 100644 --- a/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 +++ b/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 @@ -18,7 +18,7 @@ SiteToSiteProvenanceReportingTask - + diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/resources/docs/org.apache.nifi.processors.slack.PutSlack/additionalDetails.html b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/resources/docs/org.apache.nifi.processors.slack.PutSlack/additionalDetails.html index 603037af97..b6c28bc9ce 100644 --- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/resources/docs/org.apache.nifi.processors.slack.PutSlack/additionalDetails.html +++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/resources/docs/org.apache.nifi.processors.slack.PutSlack/additionalDetails.html @@ -17,7 +17,7 @@ PutSlack - + diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html index 6a3ae90fe4..1ca8b6aeb4 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html @@ -17,7 +17,7 @@ GetSNMP - + diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html index 58c73d9878..4d8430f2fd 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html @@ -17,7 +17,7 @@ SetSNMP - + diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/resources/docs/org.apache.nifi.processors.solr.PutSolrContentStream/additionalDetails.html b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/resources/docs/org.apache.nifi.processors.solr.PutSolrContentStream/additionalDetails.html index 4df0ec3318..fd680de4b5 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/resources/docs/org.apache.nifi.processors.solr.PutSolrContentStream/additionalDetails.html +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/resources/docs/org.apache.nifi.processors.solr.PutSolrContentStream/additionalDetails.html @@ -17,7 +17,7 @@ PutSolrContentStream - + diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html index babe1b57aa..de2d9e3099 100644 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html +++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html @@ -17,7 +17,7 @@ SpringContextProcessor - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DebugFlow/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DebugFlow/additionalDetails.html index 121180fc27..76249ef138 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DebugFlow/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.DebugFlow/additionalDetails.html @@ -17,7 +17,7 @@ DebugFlow - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/additionalDetails.html index 727de85d40..eee98487f2 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EncryptContent/additionalDetails.html @@ -17,7 +17,7 @@ EncryptContent - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateJsonPath/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateJsonPath/additionalDetails.html index 681d04f72f..150af81999 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateJsonPath/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateJsonPath/additionalDetails.html @@ -17,7 +17,7 @@ EvaluateJsonPath - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/additionalDetails.html index 451f9f9720..01720552fd 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.EvaluateXQuery/additionalDetails.html @@ -17,7 +17,7 @@ EvaluateXQuery - diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpRequest/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpRequest/additionalDetails.html index 5ddd32609a..70adb851ba 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpRequest/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpRequest/additionalDetails.html @@ -17,7 +17,7 @@ HandleHttpRequest - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpResponse/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpResponse/additionalDetails.html index 6e7542758d..b3273e452e 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpResponse/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.HandleHttpResponse/additionalDetails.html @@ -17,7 +17,7 @@ HandleHttpResponse - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html index 48497cbc85..bc331f6f09 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.IdentifyMimeType/additionalDetails.html @@ -18,7 +18,7 @@ IdentifyMimeType - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.JoltTransformJSON/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.JoltTransformJSON/additionalDetails.html index dbac6506ae..1dc7bfb487 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.JoltTransformJSON/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.JoltTransformJSON/additionalDetails.html @@ -17,7 +17,7 @@ JoltTransformJSON - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PartitionRecord/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PartitionRecord/additionalDetails.html index 637ac86642..c41280fee4 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PartitionRecord/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.PartitionRecord/additionalDetails.html @@ -18,14 +18,14 @@ PartitionRecord - +

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 - makes use of NiFi's RecordPath DSL. + makes use of NiFi's RecordPath DSL.

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.QueryRecord/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.QueryRecord/additionalDetails.html index d28906986b..b4bafc93cb 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.QueryRecord/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.QueryRecord/additionalDetails.html @@ -18,7 +18,7 @@ QueryRecord - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/additionalDetails.html index 53acfcdef3..a7321d9ccf 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.RouteOnAttribute/additionalDetails.html @@ -18,7 +18,7 @@ RouteOnAttribute - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html index f3a5055a70..87767a5d7f 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.TailFile/additionalDetails.html @@ -18,7 +18,7 @@ TailFile - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UpdateRecord/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UpdateRecord/additionalDetails.html index b73b4b4ae6..c76a6ed192 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UpdateRecord/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.UpdateRecord/additionalDetails.html @@ -18,12 +18,12 @@ UpdateRecord - +

- UpdateRecord makes use of the NiFi + UpdateRecord makes use of the NiFi RecordPath Domain-Specific Language (DSL) to allow the user 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 @@ -47,7 +47,7 @@ match will be updated. If the replacement value is itself a RecordPath that does not match, then a null 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. - See RecordPath Predicates for more information. + See RecordPath Predicates for more information.

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateCsv/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateCsv/additionalDetails.html index 0224befec3..530467880f 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateCsv/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ValidateCsv/additionalDetails.html @@ -17,7 +17,7 @@ ValidateCsv - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/additionalDetails.html index d11b60dd01..76c32fe320 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.controller.ControllerStatusReportingTask/additionalDetails.html @@ -17,7 +17,7 @@ ControllerStatusReportingTask - + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/additionalDetails.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/additionalDetails.html index 7f2c9c0d27..5c68d478d8 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/additionalDetails.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/resources/docs/org.apache.nifi.reporting.ganglia.StandardGangliaReporter/additionalDetails.html @@ -17,7 +17,7 @@ StandardGangliaReporter - + diff --git a/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 b/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 index af29da566e..cb85541ef6 100644 --- a/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 +++ b/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 @@ -18,7 +18,7 @@ IPLookupService - + diff --git a/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 b/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 index fe748a75ba..5a082691a2 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ CSVReader - + diff --git a/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 b/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 index 97423ecf50..a9059f70b1 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ GrokReader - + diff --git a/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 b/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 index 14d40f6236..75a93a3757 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ JsonPathReader - + diff --git a/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 b/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 index c08e72041c..6c717c34cb 100644 --- a/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 +++ b/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 @@ -17,7 +17,7 @@ JsonTreeReader - + diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html index 8b2548f663..b7c40a2e73 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html @@ -18,7 +18,7 @@ UpdateAttribute - + diff --git a/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 b/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 index 1144efa900..601556d65e 100644 --- a/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 +++ b/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 @@ -18,7 +18,7 @@ ParseEvtx - +