(cxf) branch 3.6.x-fixes updated: Fix SpringJaxrsApplicationTest test scaffolding

[reta]

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

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


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new dddd7e3e182 Fix SpringJaxrsApplicationTest test scaffolding
dddd7e3e182 is described below

commit dddd7e3e18206b90357ce68a3af647cb3cf8e49e
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Thu May 14 10:30:09 2026 -0400

    Fix SpringJaxrsApplicationTest test scaffolding
---
 .../org/apache/cxf/systest/jaxrs/resources/Catalog.java    | 14 +++-----------
 .../jaxrs/resources/{Catalog.java => CatalogApi.java}      |  7 ++-----
 .../org/apache/cxf/systest/jaxrs/resources/LibraryApi.java |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
index 5703a0a778c..1ebc6698e64 100644
--- 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
+++ 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
@@ -22,17 +22,9 @@ package org.apache.cxf.systest.jaxrs.resources;
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-public class Catalog {
-    @Produces({ MediaType.APPLICATION_JSON })
-    @Path("{catalog}")
-    @GET
-    public Collection<Book> getCatalog(@PathParam("catalog") String catalog) {
+public class Catalog implements CatalogApi {
+    @Override
+    public Collection<Book> getCatalog(String catalog) {
         return Collections.singletonList(new Book(catalog, "John Smith"));
     }
 }
diff --git 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/CatalogApi.java
similarity index 83%
copy from 
systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
copy to 
systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/CatalogApi.java
index 5703a0a778c..2bdbfcdef35 100644
--- 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/Catalog.java
+++ 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/CatalogApi.java
@@ -20,7 +20,6 @@
 package org.apache.cxf.systest.jaxrs.resources;
 
 import java.util.Collection;
-import java.util.Collections;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -28,11 +27,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-public class Catalog {
+public interface CatalogApi {
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("{catalog}")
     @GET
-    public Collection<Book> getCatalog(@PathParam("catalog") String catalog) {
-        return Collections.singletonList(new Book(catalog, "John Smith"));
-    }
+    Collection<Book> getCatalog(@PathParam("catalog") String catalog);
 }
diff --git 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/LibraryApi.java
 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/LibraryApi.java
index 01af5c74069..1960f980841 100644
--- 
a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/LibraryApi.java
+++ 
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/resources/LibraryApi.java
@@ -45,7 +45,7 @@ public interface LibraryApi {
     void deleteBooks();
     
     @Path("/catalog")
-    Catalog catalog(); 
+    CatalogApi catalog(); 
     
     @TRACE
     @Produces({ MediaType.APPLICATION_JSON })