From 58160f2e855f48ccad7d6c324d521f252ae92d45 Mon Sep 17 00:00:00 2001 From: Alisha Zaman Date: Wed, 14 Jan 2026 22:04:32 -0500 Subject: [PATCH 1/2] 603: Replaced properties with yml --- src/main/resources/application-ci.properties | 1 - src/main/resources/application-ci.yml | 2 + src/main/resources/application.properties | 78 ------------- src/main/resources/application.yml | 117 +++++++++++++++++++ 4 files changed, 119 insertions(+), 79 deletions(-) delete mode 100644 src/main/resources/application-ci.properties create mode 100644 src/main/resources/application-ci.yml delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/src/main/resources/application-ci.properties b/src/main/resources/application-ci.properties deleted file mode 100644 index 22c5d108c..000000000 --- a/src/main/resources/application-ci.properties +++ /dev/null @@ -1 +0,0 @@ -jedis.url=${REDIS_URL} diff --git a/src/main/resources/application-ci.yml b/src/main/resources/application-ci.yml new file mode 100644 index 000000000..19cd64732 --- /dev/null +++ b/src/main/resources/application-ci.yml @@ -0,0 +1,2 @@ +jedis: + url: ${REDIS_URL} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 6ef196671..000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,78 +0,0 @@ -spring.application.name=codebloom - -spring.datasource.url=jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME} -spring.datasource.username=${DATABASE_USER} -spring.datasource.password=${DATABASE_PASSWORD} -spring.datasource.driver-class-name=org.postgresql.Driver - -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.minimum-idle=5 -spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.idle-timeout=600000 -spring.datasource.hikari.max-lifetime=1800000 - -spring.flyway.enabled=false - -spring.security.oauth2.client.registration.discord.client-id=${DISCORD_CLIENT_ID} -spring.security.oauth2.client.registration.discord.client-secret=${DISCORD_CLIENT_SECRET} -spring.security.oauth2.client.registration.discord.scope=identify,email -spring.security.oauth2.client.registration.discord.authorization-grant-type=authorization_code -spring.security.oauth2.client.registration.discord.redirect-uri={baseUrl}/api/auth/flow/callback/{registrationId} - -spring.security.oauth2.client.provider.discord.authorization-uri=https://discord.com/oauth2/authorize -spring.security.oauth2.client.provider.discord.token-uri=https://discord.com/api/oauth2/token -spring.security.oauth2.client.provider.discord.user-info-uri=https://discord.com/api/users/@me -spring.security.oauth2.client.provider.discord.user-name-attribute=username - -spring.threads.virtual.enabled=true -spring.main.keep-alive=true - -spring.mvc.async.request-timeout=3h - -springdoc.swagger-ui.enabled=${ENABLE_DOCUMENTATION} -springdoc.api-docs.enabled=${ENABLE_DOCUMENTATION} -springdoc.api-docs.version=OPENAPI_3_0 - -spring.mvc.throw-exception-if-no-handler-found=true -spring.resources.add-mappings=false - -github.username=${GH_USERNAME} -github.password=${GH_PASSWORD} - -jda.discord.token=${DISCORD_TOKEN} - -jda.discord.patina.guild-id=${DISCORD_PATINA_GUILD_ID} -jda.discord.patina.leetcode-channel-id=${DISCORD_PATINA_LEETCODE_CHANNEL_ID} - -jda.discord.reporting.error.guild-id=${DISCORD_REPORTING_GUILD_ID} -jda.discord.reporting.error.channel-id=${DISCORD_REPORTING_CHANNEL_ID} - -jda.discord.reporting.log.guild-id=${DISCORD_REPORTING_LOG_GUILD_ID} -jda.discord.reporting.log.channel-id=${DISCORD_REPORTING_LOG_CHANNEL_ID} - -github.email.host=${GH_EMAIL_HOST} -github.email.port=${GH_EMAIL_PORT} -github.email.type=${GH_EMAIL_TYPE} -github.email.username=${GH_EMAIL_USERNAME} -github.email.password=${GH_EMAIL_PASSWORD} - -codebloom.email.host=${CODEBLOOM_EMAIL_HOST} -codebloom.email.port=${CODEBLOOM_EMAIL_PORT} -codebloom.email.type=${CODEBLOOM_EMAIL_TYPE} -codebloom.email.username=${CODEBLOOM_EMAIL_USERNAME} -codebloom.email.password=${CODEBLOOM_EMAIL_PASSWORD} - -spring.web.resources.cache.cachecontrol.max-age=30m -spring.web.resources.cache.cachecontrol.public=true - -management.endpoints.web.exposure.include=prometheus -management.endpoint.prometheus.enabled=true - -security.actuator.username=${ACTUATOR_USERNAME} -security.actuator.password=${ACTUATOR_PASSWORD} - -secret.key=${SECRET_KEY} - -server.url=${SERVER_URL} - -app.commit.sha=@commit.sha@ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..86c6f252a --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,117 @@ +spring: + application: + name: codebloom + + datasource: + url: jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME} + username: ${DATABASE_USER} + password: ${DATABASE_PASSWORD} + driver-class-name: org.postgresql.Driver + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + connection-timeout: 30000 + idle-timeout: 600000 + max-lifetime: 1800000 + + flyway: + enabled: false + + security: + oauth2: + client: + registration: + discord: + client-id: ${DISCORD_CLIENT_ID} + client-secret: ${DISCORD_CLIENT_SECRET} + scope: identify,email + authorization-grant-type: authorization_code + redirect-uri: "{baseUrl}/api/auth/flow/callback/{registrationId}" + provider: + discord: + authorization-uri: https://discord.com/oauth2/authorize + token-uri: https://discord.com/api/oauth2/token + user-info-uri: https://discord.com/api/users/@me + user-name-attribute: username + + threads: + virtual: + enabled: true + + main: + keep-alive: true + + mvc: + async: + request-timeout: PT3H + + web: + resources: + add-mappings: false + cache: + cachecontrol: + max-age: 30m + public: true + +springdoc: + swagger-ui: + enabled: ${ENABLE_DOCUMENTATION} + api-docs: + enabled: ${ENABLE_DOCUMENTATION} + version: OPENAPI_3_0 + +github: + username: ${GH_USERNAME} + password: ${GH_PASSWORD} + email: + host: ${GH_EMAIL_HOST} + port: ${GH_EMAIL_PORT} + type: ${GH_EMAIL_TYPE} + username: ${GH_EMAIL_USERNAME} + password: ${GH_EMAIL_PASSWORD} + +jda: + discord: + token: ${DISCORD_TOKEN} + patina: + guild-id: ${DISCORD_PATINA_GUILD_ID} + leetcode-channel-id: ${DISCORD_PATINA_LEETCODE_CHANNEL_ID} + reporting: + error: + guild-id: ${DISCORD_REPORTING_GUILD_ID} + channel-id: ${DISCORD_REPORTING_CHANNEL_ID} + log: + guild-id: ${DISCORD_REPORTING_LOG_GUILD_ID} + channel-id: ${DISCORD_REPORTING_LOG_CHANNEL_ID} + +codebloom: + email: + host: ${CODEBLOOM_EMAIL_HOST} + port: ${CODEBLOOM_EMAIL_PORT} + type: ${CODEBLOOM_EMAIL_TYPE} + username: ${CODEBLOOM_EMAIL_USERNAME} + password: ${CODEBLOOM_EMAIL_PASSWORD} + +management: + endpoints: + web: + exposure: + include: prometheus + endpoint: + prometheus: + enabled: true + +security: + actuator: + username: ${ACTUATOR_USERNAME} + password: ${ACTUATOR_PASSWORD} + +secret: + key: ${SECRET_KEY} + +server: + url: ${SERVER_URL} + +app: + commit: + sha: "@commit.sha@" From 4095af8fa46b81edcb6022ba7b6d8544212d6930 Mon Sep 17 00:00:00 2001 From: Alisha Zaman Date: Thu, 15 Jan 2026 15:01:03 -0500 Subject: [PATCH 2/2] 603: Made add-mappings to true --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 86c6f252a..7906714ac 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,7 +47,7 @@ spring: web: resources: - add-mappings: false + add-mappings: true cache: cachecontrol: max-age: 30m