Skip to content
Snippets Groups Projects
Commit d3296fc2 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Revert "Update root-path to expose non-app endpoints for health check" 

This reverts commit 40486fd7.
parent aabd5925
No related branches found
No related tags found
1 merge request!28Revert "Update root-path to expose non-app endpoints for health check"
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 2
− 2
View file @ d3296fc2
......@@ -12,11 +12,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
<quarkus.platform.version>2.6.3.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<auto-value.version>1.8.2</auto-value.version>
<hibernate.version>5.5.6.Final</hibernate.version>
<eclipse-api-version>0.6.10</eclipse-api-version>
<eclipse-api-version>0.6.5</eclipse-api-version>
<fdndb-api-version>1.0-SNAPSHOT</fdndb-api-version>
</properties>
<repositories>
......
src/main/java/org/eclipsefoundation/wg/resource/WorkingGroupsResource.java
+ 1
− 1
View file @ d3296fc2
......@@ -34,7 +34,7 @@ import org.eclipsefoundation.wg.services.WorkingGroupsService;
*
* @author Martin Lowe, Zachary Sabourin
*/
@Path("")
@Path("working-groups")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public class WorkingGroupsResource {
......
src/main/resources/application.properties
+ 0
− 2
View file @ d3296fc2
quarkus.http.root-path=/working-groups
fdndb-api/mp-rest/url=http://localhost:8095
fdndb-api/mp-rest/scope=javax.inject.Singleton
......
src/test/java/org/eclipsefoundation/wg/resource/WorkingGroupsResourceTest.java
+ 33
− 39
View file @ d3296fc2
......@@ -23,7 +23,7 @@ import io.restassured.http.ContentType;
@QuarkusTest
class WorkingGroupsResourceTest {
public final static String WGS_BASE_URL = "";
public final static String WGS_BASE_URL = "/working-groups";
public final static String WG_STATUS_URL = WGS_BASE_URL + "?status={param}";
public final static String WG_STATUSES_URL = WGS_BASE_URL + "?status={param1}&status={param2}";
......@@ -37,71 +37,65 @@ class WorkingGroupsResourceTest {
/*
* GET_ALL
*/
public final static EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper
.buildSuccessCase(WGS_BASE_URL, new String[] {}, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper.buildSuccessCase(WGS_BASE_URL,
new String[] {}, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(WGS_BASE_URL, new String[] {}, ContentType.TEXT);
public final static EndpointTestCase GET_ALL_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(WGS_BASE_URL,
new String[] {}, ContentType.TEXT);
public final static EndpointTestCase GET_ALL_SINGLE_STATUS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_STATUS_URL, new String[] { "active" },
SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_SINGLE_STATUS_SUCCESS = TestCaseHelper.buildSuccessCase(WG_STATUS_URL,
new String[] { "active" }, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_MULTI_STATUS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_STATUSES_URL, new String[] { "active", "archived" },
SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
public final static EndpointTestCase GET_ALL_MULTI_STATUS_SUCCESS = TestCaseHelper.buildSuccessCase(WG_STATUSES_URL,
new String[] { "active", "archived" }, SchemaNamespaceHelper.WORKING_GROUPS_SCHEMA_PATH);
/*
* GET_BY_ALIAS
*/
public final static EndpointTestCase GET_BY_ALIAS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_BASE_URL, new String[] { "awful-group" },
SchemaNamespaceHelper.WORKING_GROUP_SCHEMA_PATH);
public final static EndpointTestCase GET_BY_ALIAS_SUCCESS = TestCaseHelper.buildSuccessCase(WG_BASE_URL,
new String[] { "awful-group" }, SchemaNamespaceHelper.WORKING_GROUP_SCHEMA_PATH);
public final static EndpointTestCase GET_BY_ALIAS_INVALID_ALIAS = TestCaseHelper
.buildNotFoundCase(WG_BASE_URL, new String[] { "invalid-Group" }, null);
public final static EndpointTestCase GET_BY_ALIAS_INVALID_ALIAS = TestCaseHelper.buildNotFoundCase(WG_BASE_URL,
new String[] { "invalid-Group" });
public final static EndpointTestCase GET_BY_ALIAS_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(WG_BASE_URL, new String[] { "important-group" }, ContentType.TEXT);
public final static EndpointTestCase GET_BY_ALIAS_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(
WG_BASE_URL, new String[] { "important-group" }, ContentType.TEXT);
/*
* GET_RESOURCES
*/
public final static EndpointTestCase GET_RESOURCES_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_RESOURCES_URL, new String[] { "important-group" },
SchemaNamespaceHelper.WORKING_GROUP_RESOURCES_SCHEMA_PATH);
public final static EndpointTestCase GET_RESOURCES_SUCCESS = TestCaseHelper.buildSuccessCase(WG_RESOURCES_URL,
new String[] { "important-group" }, SchemaNamespaceHelper.WORKING_GROUP_RESOURCES_SCHEMA_PATH);
public final static EndpointTestCase GET_RESOURCES_INVALID_ALIAS = TestCaseHelper
.buildNotFoundCase(WG_RESOURCES_URL, new String[] { "invalid-Group" }, null);
public final static EndpointTestCase GET_RESOURCES_INVALID_ALIAS = TestCaseHelper.buildNotFoundCase(
WG_RESOURCES_URL, new String[] { "invalid-Group" });
public final static EndpointTestCase GET_RESOURCES_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(WG_RESOURCES_URL, new String[] { "mediocre-group " }, ContentType.TEXT);
public final static EndpointTestCase GET_RESOURCES_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(
WG_RESOURCES_URL, new String[] { "mediocre-group " }, ContentType.TEXT);
/*
* GET_LEVELS
*/
public final static EndpointTestCase GET_LEVELS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_LEVELS_URL, new String[] { "mediocre-group" },
SchemaNamespaceHelper.WORKING_GROUP_LEVELS_SCHEMA_PATH);
public final static EndpointTestCase GET_LEVELS_SUCCESS = TestCaseHelper.buildSuccessCase(WG_LEVELS_URL,
new String[] { "mediocre-group" }, SchemaNamespaceHelper.WORKING_GROUP_LEVELS_SCHEMA_PATH);
public final static EndpointTestCase GET_LEVELS_INVALID_ALIAS = TestCaseHelper
.buildNotFoundCase(WG_LEVELS_URL, new String[] { "invalid-Group" }, null);
public final static EndpointTestCase GET_LEVELS_INVALID_ALIAS = TestCaseHelper.buildNotFoundCase(WG_LEVELS_URL,
new String[] { "invalid-Group" });
public final static EndpointTestCase GET_LEVELS_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(WG_LEVELS_URL, new String[] { "mediocre-group " }, ContentType.TEXT);
public final static EndpointTestCase GET_LEVELS_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(
WG_LEVELS_URL, new String[] { "mediocre-group " }, ContentType.TEXT);
/*
* GET_AGREEMENTS
*/
public final static EndpointTestCase GET_AGREEMENTS_SUCCESS = TestCaseHelper
.buildSuccessCase(WG_AGREEMENTS_URL, new String[] { "important-group" },
SchemaNamespaceHelper.WORKING_GROUP_AGREEMENT_SCHEMA_PATH);
public final static EndpointTestCase GET_AGREEMENTS_SUCCESS = TestCaseHelper.buildSuccessCase(WG_AGREEMENTS_URL,
new String[] { "important-group" }, SchemaNamespaceHelper.WORKING_GROUP_AGREEMENT_SCHEMA_PATH);
public final static EndpointTestCase GET_AGREEMENTS_INVALID_ALIAS = TestCaseHelper
.buildNotFoundCase(WG_AGREEMENTS_URL, new String[] { "invalid-Group" }, null);
public final static EndpointTestCase GET_AGREEMENTS_INVALID_ALIAS = TestCaseHelper.buildNotFoundCase(
WG_AGREEMENTS_URL, new String[] { "invalid-Group" });
public final static EndpointTestCase GET_AGREEMENTS_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(WG_AGREEMENTS_URL, new String[] { "important-group" }, ContentType.TEXT);
public final static EndpointTestCase GET_AGREEMENTS_INVALID_FORMAT = TestCaseHelper.buildInvalidFormatCase(
WG_AGREEMENTS_URL, new String[] { "important-group" }, ContentType.TEXT);
@Test
void getAll_success() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent