This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 43590bc406 NIFI-15103 Removed web-utils module from commons
43590bc406 is described below
commit 43590bc40653390bc8237dc47df831fcfc9b523f
Author: exceptionfactory <[email protected]>
AuthorDate: Thu Oct 16 22:32:20 2025 -0500
NIFI-15103 Removed web-utils module from commons
- Moved ObjectMapperResolver to web-api and update-attribute-ui modules
Signed-off-by: Pierre Villard <[email protected]>
This closes #10430.
---
nifi-code-coverage/pom.xml | 5 --
nifi-commons/nifi-web-utils/pom.xml | 54 -------------
.../org/apache/nifi/web/util/WebClientUtils.java | 89 ----------------------
nifi-commons/pom.xml | 1 -
.../attributes/mapper}/ObjectMapperResolver.java | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../nifi-framework-nar-bom/pom.xml | 10 ---
nifi-framework-bundle/nifi-framework-nar/pom.xml | 5 --
.../nifi-framework-components/pom.xml | 5 --
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 5 --
.../apache/nifi/web/util/ObjectMapperResolver.java | 1 -
11 files changed, 2 insertions(+), 177 deletions(-)
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index e0c98d025a..841153cab8 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -387,11 +387,6 @@
<artifactId>nifi-web-client-api</artifactId>
<version>2.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <version>2.7.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
diff --git a/nifi-commons/nifi-web-utils/pom.xml
b/nifi-commons/nifi-web-utils/pom.xml
deleted file mode 100644
index 2bf6598b60..0000000000
--- a/nifi-commons/nifi-web-utils/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-commons</artifactId>
- <version>2.7.0-SNAPSHOT</version>
- </parent>
- <artifactId>nifi-web-utils</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebClientUtils.java
b/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebClientUtils.java
deleted file mode 100644
index 9dc24d1ecb..0000000000
---
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebClientUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web.util;
-
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.glassfish.jersey.client.ClientConfig;
-import
org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-
-import javax.net.ssl.SSLContext;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-
-/**
- * Client utilities for Jakarta RESTful Web Services
- */
-public final class WebClientUtils {
-
- private WebClientUtils() {
- }
-
- /**
- * Creates a client for non-secure requests. The client will be created
- * using the given configuration. Additionally, the client will be
- * automatically configured for JSON serialization/deserialization.
- *
- * @param config client configuration
- * @return a Client instance
- */
- public static Client createClient(final ClientConfig config) {
- return createClientHelper(config, null);
- }
-
- /**
- * Creates a client for secure requests. The client will be created using
- * the given configuration and security context. Additionally, the client
- * will be automatically configured for JSON serialization/deserialization.
- *
- * @param config client configuration
- * @param ctx security context
- * @return a Client instance
- */
- public static Client createClient(final ClientConfig config, final
SSLContext ctx) {
- return createClientHelper(config, ctx);
- }
-
- /**
- * A helper method for creating clients. The client will be created using
- * the given configuration and security context. Additionally, the client
- * will be automatically configured for JSON serialization/deserialization.
- *
- * @param config client configuration
- * @param ctx security context, which may be null for non-secure client
- * creation
- * @return a Client instance
- */
- private static Client createClientHelper(final ClientConfig config, final
SSLContext ctx) {
-
- ClientBuilder clientBuilder = ClientBuilder.newBuilder();
-
- if (config != null) {
- clientBuilder = clientBuilder.withConfig(config);
- }
-
- if (ctx != null) {
-
- // Apache http DefaultHostnameVerifier that checks subject
alternative names against the hostname of the URI
- clientBuilder = clientBuilder.sslContext(ctx).hostnameVerifier(new
DefaultHostnameVerifier());
- }
-
- clientBuilder =
clientBuilder.register(ObjectMapperResolver.class).register(JacksonJaxbJsonProvider.class);
-
- return clientBuilder.build();
-
- }
-}
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index 3c6071ea3f..f6b2bd57ba 100644
--- a/nifi-commons/pom.xml
+++ b/nifi-commons/pom.xml
@@ -65,7 +65,6 @@
<module>nifi-web-client-api</module>
<module>nifi-content-viewer-utils</module>
<module>nifi-web-servlet-shared</module>
- <module>nifi-web-utils</module>
<module>nifi-write-ahead-log</module>
<module>nifi-xml-processing</module>
<module>nifi-calcite-utils</module>
diff --git
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/mapper/ObjectMapperResolver.java
similarity index 97%
copy from
nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
copy to
nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/mapper/ObjectMapperResolver.java
index ffebed1d1d..d54e9c4be6 100644
---
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
+++
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/mapper/ObjectMapperResolver.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nifi.web.util;
+package org.apache.nifi.update.attributes.mapper;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonInclude.Value;
diff --git
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/web.xml
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/web.xml
index 7bb8671d40..4b77a73403 100644
---
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/web.xml
+++
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
</init-param>
<init-param>
<param-name>jersey.config.server.provider.classnames</param-name>
-
<param-value>org.apache.nifi.web.util.ObjectMapperResolver;org.glassfish.jersey.jackson.JacksonFeature</param-value>
+
<param-value>org.apache.nifi.update.attributes.mapper.ObjectMapperResolver;org.glassfish.jersey.jackson.JacksonFeature</param-value>
</init-param>
</servlet>
<servlet-mapping>
diff --git a/nifi-framework-bundle/nifi-framework-nar-bom/pom.xml
b/nifi-framework-bundle/nifi-framework-nar-bom/pom.xml
index 6035841c7e..9223f513af 100644
--- a/nifi-framework-bundle/nifi-framework-nar-bom/pom.xml
+++ b/nifi-framework-bundle/nifi-framework-nar-bom/pom.xml
@@ -195,12 +195,6 @@
<version>2.7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <version>2.7.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-xml-processing</artifactId>
@@ -320,10 +314,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-xml-processing</artifactId>
diff --git a/nifi-framework-bundle/nifi-framework-nar/pom.xml
b/nifi-framework-bundle/nifi-framework-nar/pom.xml
index 0fd6f37c64..d5ef9e5f51 100644
--- a/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -165,11 +165,6 @@
<artifactId>nifi-web-servlet-shared</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-xml-processing</artifactId>
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
index 1a2d2a00eb..490831a40d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
@@ -109,11 +109,6 @@
<artifactId>nifi-data-provenance-utils</artifactId>
<version>2.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <version>2.7.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index d1f1325e5f..361e3f3259 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -179,11 +179,6 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope> <!-- expected to be provided by parent
classloader -->
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <scope>provided</scope> <!-- expected to be provided by parent
classloader -->
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-servlet-shared</artifactId>
diff --git
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
similarity index 99%
rename from
nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
rename to
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
index ffebed1d1d..9d4646c471 100644
---
a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ObjectMapperResolver.java
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonInclude.Value;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import
com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
-
import jakarta.ws.rs.ext.ContextResolver;
import jakarta.ws.rs.ext.Provider;
