From 9f0bba20b3ea7c7500a90fae998343bffcb84374 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Wed, 7 Oct 2026 14:30:05 +0100 Subject: [PATCH] Remove Root endpoint --- .../jboss/da/rest/ReportsRestActivator.java | 1 - .../src/main/java/org/jboss/da/rest/Root.java | 40 ----------------- .../test/client/rest/RestApiIndexTestIT.java | 45 ------------------- .../client/rest/RestApiVersionTestIT.java | 33 ++++++++++++++ 4 files changed, 33 insertions(+), 86 deletions(-) delete mode 100644 reports-rest/src/main/java/org/jboss/da/rest/Root.java delete mode 100644 testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiIndexTestIT.java create mode 100644 testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiVersionTestIT.java diff --git a/reports-rest/src/main/java/org/jboss/da/rest/ReportsRestActivator.java b/reports-rest/src/main/java/org/jboss/da/rest/ReportsRestActivator.java index 407bef061..6a293bfff 100644 --- a/reports-rest/src/main/java/org/jboss/da/rest/ReportsRestActivator.java +++ b/reports-rest/src/main/java/org/jboss/da/rest/ReportsRestActivator.java @@ -56,7 +56,6 @@ public Set> getClasses() { * @param resources Resource to be added */ public void addProjectResources(Set> resources) { - resources.add(Root.class); resources.add(Reports.class); resources.add(LookupImpl.class); resources.add(BlackListImpl.class); diff --git a/reports-rest/src/main/java/org/jboss/da/rest/Root.java b/reports-rest/src/main/java/org/jboss/da/rest/Root.java deleted file mode 100644 index f819a57b2..000000000 --- a/reports-rest/src/main/java/org/jboss/da/rest/Root.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.jboss.da.rest; - -import static org.jboss.da.common.Constants.COMMIT_HASH; -import static org.jboss.da.common.Constants.DA_VERSION; -import static org.jboss.da.common.Constants.REST_API_VERSION_BC; -import static org.jboss.da.common.Constants.REST_API_VERSION_REPORTS; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -/** - * - * @author Jozef Mrazek <jmrazek@redhat.com> - * - */ -@Path("/") -public class Root { - - @GET - @Produces(MediaType.TEXT_HTML) - public String getDescription() { - return String.format( - """ -

Dependency analysis service REST API

-
  • DA Version: %s
  • - """, - DA_VERSION, - COMMIT_HASH, - REST_API_VERSION_BC, - REST_API_VERSION_REPORTS); - } - -} diff --git a/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiIndexTestIT.java b/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiIndexTestIT.java deleted file mode 100644 index 68d515336..000000000 --- a/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiIndexTestIT.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.jboss.da.test.client.rest; - -import static org.jboss.da.common.Constants.COMMIT_HASH; -import static org.jboss.da.common.Constants.DA_VERSION; -import static org.jboss.da.common.Constants.REST_API_VERSION_BC; -import static org.jboss.da.common.Constants.REST_API_VERSION_REPORTS; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import jakarta.ws.rs.core.Response; - -import org.junit.jupiter.api.Test; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.h2.H2DatabaseTestResource; -import io.quarkus.test.junit.QuarkusTest; - -@QuarkusTest -@QuarkusTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = true) -public class RestApiIndexTestIT extends AbstractRestReportsTest { - - @Test - public void testIndexHtml() { - String path = "/"; - Response response = createWebTarget(path).request().get(); - - assertEquals(getExpectedResponse(), response.readEntity(String.class)); - } - - private String getExpectedResponse() { - return String.format( - """ -

    Dependency analysis service REST API

    -
    • DA Version: %s
    • - """, - DA_VERSION, - COMMIT_HASH, - REST_API_VERSION_BC, - REST_API_VERSION_REPORTS); - } -} diff --git a/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiVersionTestIT.java b/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiVersionTestIT.java new file mode 100644 index 000000000..f5b62feb4 --- /dev/null +++ b/testsuite/src/test/java/org/jboss/da/test/client/rest/RestApiVersionTestIT.java @@ -0,0 +1,33 @@ +package org.jboss.da.test.client.rest; + +import static org.jboss.da.common.Constants.COMMIT_HASH; +import static org.jboss.da.common.Constants.DA_VERSION; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import jakarta.ws.rs.core.Response; + +import org.json.JSONObject; +import org.junit.jupiter.api.Test; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +@QuarkusTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = true) +public class RestApiVersionTestIT extends AbstractRestReportsTest { + + @Test + public void testVersionEndpoint() { + String path = "/version"; + Response response = createClientRequest(path).get(); + assertEquals(200, response.getStatus()); + + JSONObject json = new JSONObject(response.readEntity(String.class)); + assertEquals("Dependency Analysis", json.getString("name")); + assertEquals(DA_VERSION, json.getString("version")); + assertEquals(COMMIT_HASH, json.getString("commit")); + assertFalse(json.getString("builtOn").isEmpty()); + } +}