(cxf) branch 4.0.x-fixes updated: [CXF-9153]The class org.apache.cxf.transport.servlet.servicelist.UnformattedServiceListWriter does not work for RESTful destinations

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/4.0.x-fixes by this push:
     new 7a801c2f9d [CXF-9153]The class 
org.apache.cxf.transport.servlet.servicelist.UnformattedServiceListWriter does 
not work for RESTful destinations
7a801c2f9d is described below

commit 7a801c2f9d94b98d81a328c57b3e5351efcfceb7
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Tue Jul 22 14:25:31 2025 -0400

    [CXF-9153]The class 
org.apache.cxf.transport.servlet.servicelist.UnformattedServiceListWriter does 
not work for RESTful destinations
    
    (cherry picked from commit 01b6fa1af06c0d907bb796b31cb0732e3afc4808)
---
 .../servlet/servicelist/UnformattedServiceListWriter.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
index 2f93431b4c..1dce566a9a 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
@@ -36,7 +36,7 @@ public class UnformattedServiceListWriter implements 
ServiceListWriter {
     }
 
     public String getContentType() {
-        return "text/html; charset=UTF-8";
+        return "text/plain; charset=UTF-8";
     }
 
     public void writeServiceList(PrintWriter writer,
@@ -80,14 +80,16 @@ public class UnformattedServiceListWriter implements 
ServiceListWriter {
             address = StringEscapeUtils.escapeHtml4(address);
 
             boolean wadlAvailable = bus != null
-                && 
PropertyUtils.isTrue(bus.getProperty("wadl.service.descrition.available"));
+                && 
PropertyUtils.isTrue(bus.getProperty("wadl.service.description.available"));
             boolean swaggerAvailable = bus != null
-                && 
PropertyUtils.isTrue(bus.getProperty("swagger.service.descrition.available"));
+                && 
PropertyUtils.isTrue(bus.getProperty("swagger.service.description.available"));
             boolean openApiAvailable = bus != null
-                && 
PropertyUtils.isTrue(bus.getProperty("openapi.service.descrition.available"));
-            if (!wadlAvailable && !swaggerAvailable) {
+                && 
PropertyUtils.isTrue(bus.getProperty("openapi.service.description.available"));
+            if (!wadlAvailable 
+                && !swaggerAvailable
+                && !openApiAvailable) {
                 writer.write(address + "\n");
-                return;
+                continue;
             }
             if (wadlAvailable) {
                 writer.write(address + "?_wadl\n");