Skip to content
Snippets Groups Projects
Commit 0aff3e00 authored by Zachary Sabourin's avatar Zachary Sabourin
Browse files

Merge branch 'zacharysabourin/main/13' into 'main'

feat: Standardize configs

See merge request !21
parents d4b03f88 32154319
No related branches found
No related tags found
1 merge request!21feat: Standardize configs
Pipeline #30548 passed
......@@ -7,14 +7,14 @@
<artifactId>eclipsefdn-mailing-lists</artifactId>
<version>1.0.0-SNAPSHOT</version>
<properties>
<eclipse-api-version>0.6.10</eclipse-api-version>
<eclipse-api-version>0.7.7</eclipse-api-version>
<surefire-plugin.version>2.22.1</surefire-plugin.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
<quarkus.platform.version>2.16.7.Final</quarkus.platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<maven.compiler.parameters>true</maven.compiler.parameters>
......
......@@ -8,8 +8,8 @@ security.csrf.enabled=true
security.csrf.distributed-mode.default-provider=false
## DATASOURCE CONFIG
eclipse.db.default.limit=10
eclipse.db.default.limit.max=100
eclipse.persistence.pagination-limit=10
eclipse.persistence.pagination-limit.max=100
quarkus.datasource.db-kind=mariadb
quarkus.datasource.jdbc.min-size = 5
quarkus.datasource.jdbc.max-size = 15
......@@ -26,4 +26,4 @@ quarkus.oidc-client.scopes=eclipsefdn_view_all_profiles
# Tells Quarkus which objects are associated with what databases (used to generate entity tables internally)
quarkus.hibernate-orm.packages=org.eclipsefoundation.mailing.dto,org.eclipsefoundation.persistence.dto
quarkus.hibernate-orm.datasource=<default>
quarkus.hibernate-orm.physical-naming-strategy=org.eclipsefoundation.mailing.config.DefaultPhysicalNamingStrategy
\ No newline at end of file
quarkus.hibernate-orm.physical-naming-strategy=org.eclipsefoundation.mailing.config.DefaultPhysicalNamingStrategy
......@@ -20,7 +20,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
@TestInstance(Lifecycle.PER_CLASS)
@QuarkusTest
......@@ -40,9 +39,6 @@ class MailingListsResourceTests {
public static final EndpointTestCase GET_ALL_SUCCESS = TestCaseHelper
.buildSuccessCase(MAILING_LISTS_BASE_URL, new String[] {}, SchemaNamespaceHelper.MAILING_LISTS_SCHEMA_PATH);
public static final EndpointTestCase GET_ALL_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(MAILING_LISTS_BASE_URL, new String[] {}, ContentType.TEXT);
/*
* GET AVAILABLE
*/
......@@ -50,9 +46,6 @@ class MailingListsResourceTests {
.buildSuccessCase(AVAILABLE_MAILING_LISTS_URL, new String[] {},
SchemaNamespaceHelper.MAILING_LISTS_SCHEMA_PATH);
public static final EndpointTestCase GET_AVAILABLE_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(AVAILABLE_MAILING_LISTS_URL, new String[] {}, ContentType.XML);
/*
* BY NAME
*/
......@@ -60,9 +53,6 @@ class MailingListsResourceTests {
.buildSuccessCase(MAILING_LISTS_BY_NAME_URL, new String[] { "eclipse-dev" },
SchemaNamespaceHelper.MAILING_LISTS_SCHEMA_PATH);
public static final EndpointTestCase GET_MAILING_LISTS_BY_NAME_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(MAILING_LISTS_BY_NAME_URL, new String[] { "eclipse-dev" }, ContentType.XML);
public static final EndpointTestCase GET_MAILING_LISTS_BY_NAME_NOT_FOUND = TestCaseHelper
.buildNotFoundCase(MAILING_LISTS_BY_NAME_URL, new String[] { "elipse-dem" }, null);
......@@ -73,9 +63,6 @@ class MailingListsResourceTests {
.buildSuccessCase(PROJECTS_MAILING_LISTS_URL, new String[] {},
SchemaNamespaceHelper.MAILING_LIST_MAPPING_SCHEMA_PATH);
public static final EndpointTestCase GET_PROJECTS_MAILING_LISTS_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(PROJECTS_MAILING_LISTS_URL, new String[] {}, ContentType.XML);
/*
* GET AVAILABLE PROJECTS
*/
......@@ -83,9 +70,6 @@ class MailingListsResourceTests {
.buildSuccessCase(AVAILABLE_PROJECTS_MAILING_LISTS_URL, new String[] {},
SchemaNamespaceHelper.MAILING_LIST_MAPPING_SCHEMA_PATH);
public static final EndpointTestCase GET_AVAILABLE_PROJECTS_MAILING_LISTS_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(AVAILABLE_PROJECTS_MAILING_LISTS_URL, new String[] {}, ContentType.XML);
/*
* PROJECTS MAILING LISTS BY NAME
*/
......@@ -93,9 +77,6 @@ class MailingListsResourceTests {
.buildSuccessCase(PROJECT_MAILING_LISTS_URL, new String[] { "ee4j" },
SchemaNamespaceHelper.MAILING_LISTS_SCHEMA_PATH);
public static final EndpointTestCase GET_PROJECTS_MAILING_LISTS_BY_ID_INVALID_FORMAT = TestCaseHelper
.buildInvalidFormatCase(PROJECT_MAILING_LISTS_URL, new String[] { "ee4j" }, ContentType.XML);
/*
* GET ALL
*/
......@@ -114,11 +95,6 @@ class MailingListsResourceTests {
RestAssuredTemplates.testGet_validateSchema(GET_ALL_SUCCESS);
}
@Test
void getMailingLists_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_ALL_INVALID_FORMAT);
}
/*
* GET AVAILABLE
*/
......@@ -137,11 +113,6 @@ class MailingListsResourceTests {
RestAssuredTemplates.testGet_validateSchema(GET_AVAILABLE_SUCCESS);
}
@Test
void getAvailableMailingLists_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_AVAILABLE_INVALID_FORMAT);
}
/*
* BY NAME
*/
......@@ -160,11 +131,6 @@ class MailingListsResourceTests {
RestAssuredTemplates.testGet_validateSchema(GET_MAILING_LISTS_BY_NAME_SUCCESS);
}
@Test
void getMailingList_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_MAILING_LISTS_BY_NAME_INVALID_FORMAT);
}
@Test
void getMailingList_failure_notFound() {
RestAssuredTemplates.testGet(GET_MAILING_LISTS_BY_NAME_NOT_FOUND);
......@@ -188,11 +154,6 @@ class MailingListsResourceTests {
RestAssuredTemplates.testGet_validateSchema(GET_PROJECTS_MAILING_LISTS_SUCCESS);
}
@Test
void getProjectsMailingLists_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_PROJECTS_MAILING_LISTS_INVALID_FORMAT);
}
/*
* GET AVILABLE PROJECTS MAILING LISTS
*/
......@@ -211,11 +172,6 @@ class MailingListsResourceTests {
RestAssuredTemplates.testGet_validateSchema(GET_AVAILABLE_PROJECTS_MAILING_LISTS_SUCCESS);
}
@Test
void getAvailableProjectsMailingLists_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_AVAILABLE_PROJECTS_MAILING_LISTS_INVALID_FORMAT);
}
/*
* GET PROJECT MAILING LIST BY ID
*/
......@@ -233,9 +189,4 @@ class MailingListsResourceTests {
void getProjectMailingList_success_validSchema() {
RestAssuredTemplates.testGet_validateSchema(GET_PROJECTS_MAILING_LISTS_BY_ID_SUCCESS);
}
@Test
void getProjectMailingList_failure_invalidFormat() {
RestAssuredTemplates.testGet(GET_PROJECTS_MAILING_LISTS_BY_ID_INVALID_FORMAT);
}
}
}
\ No newline at end of file
## DATASOURCE CONFIG
quarkus.datasource.db-kind=h2
eclipse.db.default.limit=25
eclipse.db.default.limit.max=100
eclipse.persistence.pagination-limit=25
eclipse.persistence.pagination-limit.max=100
quarkus.hibernate-orm.database.generation=none
# Flyway configuration for the default datasource
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment