Dark-Alex-17/alerting-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated package prefix to use personal website

Browse Source
This commit is contained in:
Alex Clarke
2024-02-18 10:06:02 -07:00
parent 44d5325e39
commit ed26c2ba57
41 changed files with 107 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+7 -11
View File
@@ -1,6 +1,6 @@
# Dynanmic, Reactive Alerting API (Proof-of-Concept) # Simple Alerting API
This project is a proof-of-concept API for a dynamic, reactive alerting system. This project is a simple API for a dynamic, reactive alerting system (minus the notification component).
It consists of four different modules that comprise the overall functionality of the project. It consists of four different modules that comprise the overall functionality of the project.
* amqp * amqp
@@ -8,18 +8,16 @@ It consists of four different modules that comprise the overall functionality of
* batch * batch
* persistence * persistence
*Note that the notification component is not part of this proof-of-concept*
## Architecture ## Architecture
![alerting architecture](./alerting-architecture.png) ![alerting architecture](./alerting-architecture.png)
## Getting Started ## Getting Started
1. Clone the project. `git clone git@github.com:Dark-Alex-17/alerting-poc.git` 1. Clone the project. `git clone git@github.com:Dark-Alex-17/alerting-api.git`
2. Open the `alerting-poc` folder with IntelliJ. Use auto-import for a Gradle 2. Open the `alerting-api` folder with IntelliJ. Use auto-import for a Gradle
project. project.
## Running the POC ## Running the API
### Start the persistence tier ### Start the persistence tier
The persistence tier will start up the in-memory H2 database. Once started, The persistence tier will start up the in-memory H2 database. Once started,
Flyway will populate the database with the alerting schema and test data, and also Flyway will populate the database with the alerting schema and test data, and also
@@ -30,8 +28,6 @@ can use the database.
The H2 browser console is available at http://localhost:8081/h2-console The H2 browser console is available at http://localhost:8081/h2-console
#### Start the Persistence Layer
`./gradlew persistence:bootRun` `./gradlew persistence:bootRun`
### Start the batch worker ### Start the batch worker
@@ -47,9 +43,9 @@ The API is how users provision alerts and recipients, and all data is persisted
Additionally, all operations send a message to RabbitMQ to provision and schedule Quartz jobs in the Additionally, all operations send a message to RabbitMQ to provision and schedule Quartz jobs in the
batch worker. batch worker.
The API is available at http://localhost:8080/poc/alerting/v1/ The API is available at http://localhost:8080/api/alerting/v1/
API documentation is available [here](https://dark-alex-17.github.io/alerting-poc/) API documentation is available [here](https://dark-alex-17.github.io/alerting-api/)
`./gradlew api:bootRun` `./gradlew api:bootRun`
amqp/src/main/java/com/poc/alerting/amqp/AmqpMessage.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/AmqpMessage.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
import java.io.Serializable; import java.io.Serializable;
amqp/src/main/java/com/poc/alerting/amqp/AmqpResponse.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/AmqpResponse.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
import java.io.Serializable; import java.io.Serializable;
amqp/src/main/java/com/poc/alerting/amqp/ExceptionType.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/ExceptionType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
public enum ExceptionType { public enum ExceptionType {
INVALID_REQUEST_EXCEPTION(400), INVALID_REQUEST_EXCEPTION(400),
amqp/src/main/java/com/poc/alerting/amqp/GsonMessageConverter.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/GsonMessageConverter.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
import java.io.Serializable; import java.io.Serializable;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
amqp/src/main/java/com/poc/alerting/amqp/MessageDataTransferObject.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/MessageDataTransferObject.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
import java.io.Serializable; import java.io.Serializable;
amqp/src/main/java/com/poc/alerting/amqp/RabbitSender.java → amqp/src/main/java/com/alexjclarke/alerting/amqp/RabbitSender.java
+1 -2
View File
@@ -1,7 +1,6 @@
package com.poc.alerting.amqp; package com.alexjclarke.alerting.amqp;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
amqp/src/main/kotlin/com/poc/alerting/amqp/AlertingAmqpMessage.kt → amqp/src/main/kotlin/com/alexjclarke/alerting/amqp/AlertingAmqpMessage.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp package com.alexjclarke.alerting.amqp
sealed class AlertingAmqpMessage( sealed class AlertingAmqpMessage(
val alertId: String, val alertId: String,
@@ -9,7 +9,7 @@ sealed class AlertingAmqpMessage(
} }
override fun getExchange(): String { override fun getExchange(): String {
return "poc_alerting" return "alerting_api"
} }
class Add(val frequency: String, alertId: String, accountId: String): AlertingAmqpMessage(alertId, accountId) class Add(val frequency: String, alertId: String, accountId: String): AlertingAmqpMessage(alertId, accountId)
amqp/src/main/kotlin/com/poc/alerting/amqp/AmqpConfiguration.kt → amqp/src/main/kotlin/com/alexjclarke/alerting/amqp/AmqpConfiguration.kt
+8 -8
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.amqp package com.alexjclarke.alerting.amqp
import org.apache.commons.lang3.time.DateUtils.MILLIS_PER_MINUTE import org.apache.commons.lang3.time.DateUtils.MILLIS_PER_MINUTE
import org.springframework.amqp.core.Binding import org.springframework.amqp.core.Binding
@@ -16,10 +16,10 @@ import org.springframework.context.annotation.ComponentScan
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
@Configuration @Configuration
@ComponentScan(basePackages = ["com.poc.alerting.amqp"]) @ComponentScan(basePackages = ["com.alexjclarke.alerting.amqp"])
open class AmqpConfiguration { open class AmqpConfiguration {
companion object { companion object {
const val AMQP_NAME = "poc_alerting" const val AMQP_NAME = "alerting_api"
const val NEW_ACCOUNT = "new_account" const val NEW_ACCOUNT = "new_account"
const val FANOUT_NAME = "${AMQP_NAME}_fanout" const val FANOUT_NAME = "${AMQP_NAME}_fanout"
} }
@@ -27,8 +27,8 @@ open class AmqpConfiguration {
@Bean @Bean
open fun connectionFactory(): ConnectionFactory { open fun connectionFactory(): ConnectionFactory {
return CachingConnectionFactory().apply { return CachingConnectionFactory().apply {
virtualHost = "poc" virtualHost = "api"
username = "poc_user" username = "api_user"
setPassword("s!mpleP@ssw0rd") setPassword("s!mpleP@ssw0rd")
setAddresses("localhost") setAddresses("localhost")
} }
@@ -50,7 +50,7 @@ open class AmqpConfiguration {
} }
@Bean @Bean
open fun pocAlertingExchange(): FanoutExchange { open fun alertingExchange(): FanoutExchange {
return FanoutExchange(FANOUT_NAME) return FanoutExchange(FANOUT_NAME)
} }
@@ -63,8 +63,8 @@ open class AmqpConfiguration {
} }
@Bean @Bean
open fun exchangeBinding(directExchange: Exchange, pocAlertingExchange: FanoutExchange): Binding { open fun exchangeBinding(directExchange: Exchange, alertingExchange: FanoutExchange): Binding {
return BindingBuilder.bind(directExchange).to(pocAlertingExchange) return BindingBuilder.bind(directExchange).to(alertingExchange)
} }
@Bean @Bean
api/build.gradle.kts
+1 -1
View File
@@ -23,5 +23,5 @@ dependencies {
tasks.getByName<BootJar>("bootJar") { tasks.getByName<BootJar>("bootJar") {
enabled = true enabled = true
mainClass.set("com.poc.alerting.api.AlertingApi") mainClass.set("com.alexjclarke.alerting.api.AlertingApi")
} }
api/src/main/java/com/poc/alerting/api/PropertyCopier.java → api/src/main/java/com/alexjclarke/alerting/api/PropertyCopier.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.api; package com.alexjclarke.alerting.api;
import java.beans.FeatureDescriptor; import java.beans.FeatureDescriptor;
import java.util.List; import java.util.List;
api/src/main/kotlin/com/poc/alerting/api/AlertingApi.kt → api/src/main/kotlin/com/alexjclarke/alerting/api/AlertingApi.kt
+2 -2
View File
@@ -1,9 +1,9 @@
package com.poc.alerting.api package com.alexjclarke.alerting.api
import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication import org.springframework.boot.runApplication
@SpringBootApplication(scanBasePackages = ["com.poc.alerting"]) @SpringBootApplication(scanBasePackages = ["com.alexjclarke.alerting"])
open class AlertingApi open class AlertingApi
fun main(args: Array<String>) { fun main(args: Array<String>) {
api/src/main/kotlin/com/poc/alerting/api/controller/AlertController.kt → api/src/main/kotlin/com/alexjclarke/alerting/api/controller/AlertController.kt
+11 -11
View File
@@ -1,15 +1,15 @@
package com.poc.alerting.api.controller package com.alexjclarke.alerting.api.controller
import com.poc.alerting.amqp.AlertingAmqpMessage.Add import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Add
import com.poc.alerting.amqp.AlertingAmqpMessage.Delete import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Delete
import com.poc.alerting.amqp.AlertingAmqpMessage.Pause import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Pause
import com.poc.alerting.amqp.AlertingAmqpMessage.Resume import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Resume
import com.poc.alerting.amqp.AlertingAmqpMessage.Update import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Update
import com.poc.alerting.amqp.RabbitSender import com.alexjclarke.alerting.amqp.RabbitSender
import com.poc.alerting.api.PropertyCopier import com.alexjclarke.alerting.api.PropertyCopier
import com.poc.alerting.persistence.dto.Alert import com.alexjclarke.alerting.persistence.dto.Alert
import com.poc.alerting.persistence.repositories.AccountRepository import com.alexjclarke.alerting.persistence.repositories.AccountRepository
import com.poc.alerting.persistence.repositories.AlertRepository import com.alexjclarke.alerting.persistence.repositories.AlertRepository
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
api/src/main/kotlin/com/poc/alerting/api/controller/RecipientController.kt → api/src/main/kotlin/com/alexjclarke/alerting/api/controller/RecipientController.kt
+4 -4
View File
@@ -1,8 +1,8 @@
package com.poc.alerting.api.controller package com.alexjclarke.alerting.api.controller
import com.poc.alerting.api.PropertyCopier import com.alexjclarke.alerting.api.PropertyCopier
import com.poc.alerting.persistence.dto.Recipient import com.alexjclarke.alerting.persistence.dto.Recipient
import com.poc.alerting.persistence.repositories.RecipientRepository import com.alexjclarke.alerting.persistence.repositories.RecipientRepository
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
api/src/main/resources/application.yml
+1 -1
View File
@@ -1,6 +1,6 @@
server: server:
servlet: servlet:
contextPath: "/poc/alerting/v1" contextPath: "/api/alerting/v1"
port: 8080 port: 8080
spring: spring:
jackson: jackson:
batch/build.gradle.kts
+2 -2
View File
@@ -21,9 +21,9 @@ dependencies {
tasks.getByName<BootJar>("bootJar") { tasks.getByName<BootJar>("bootJar") {
enabled = true enabled = true
mainClass.set("com.poc.alerting.batch.BatchWorkerKt") mainClass.set("com.alexjclarke.alerting.batch.BatchWorkerKt")
} }
springBoot { springBoot {
mainClass.set("com.poc.alerting.batch.BatchWorkerKt") mainClass.set("com.alexjclarke.alerting.batch.BatchWorkerKt")
} }
batch/src/main/java/com/poc/alerting/batch/AccountConsumerManager.java → batch/src/main/java/com/alexjclarke/alerting/batch/AccountConsumerManager.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch; package com.alexjclarke.alerting.batch;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
batch/src/main/java/com/poc/alerting/batch/ApplicationStartup.java → batch/src/main/java/com/alexjclarke/alerting/batch/ApplicationStartup.java
+3 -4
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch; package com.alexjclarke.alerting.batch;
import java.util.Base64; import java.util.Base64;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@@ -10,7 +10,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter; import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@@ -37,7 +36,7 @@ public class ApplicationStartup implements ApplicationListener<ApplicationReadyE
LOG.info("Creating consumers for existing queues"); LOG.info("Creating consumers for existing queues");
try { try {
final String rabbitMqUrl = String.format("http://%s:15672/api/exchanges/poc/alerting/bindings/source", "localhost"); final String rabbitMqUrl = String.format("http://%s:15672/api/exchanges/alexjclarke/alerting/bindings/source", "localhost");
//auth is kind of a kluge here. Apparently the HttpClient Fluent API doesn't support //auth is kind of a kluge here. Apparently the HttpClient Fluent API doesn't support
//it except by explicitly setting the auth header. //it except by explicitly setting the auth header.
@@ -59,7 +58,7 @@ public class ApplicationStartup implements ApplicationListener<ApplicationReadyE
} }
private String getAuthToken() { private String getAuthToken() {
final String basicPlaintext = "poc" + ":" + "s!mpleP@ssw0rd"; final String basicPlaintext = "api_user" + ":" + "s!mpleP@ssw0rd";
final Base64.Encoder encoder = Base64.getEncoder(); final Base64.Encoder encoder = Base64.getEncoder();
return encoder.encodeToString(basicPlaintext.getBytes()); return encoder.encodeToString(basicPlaintext.getBytes());
batch/src/main/java/com/poc/alerting/batch/ExclusiveConsumerExceptionLogger.java → batch/src/main/java/com/alexjclarke/alerting/batch/ExclusiveConsumerExceptionLogger.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch; package com.alexjclarke.alerting.batch;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.springframework.amqp.support.ConditionalExceptionLogger; import org.springframework.amqp.support.ConditionalExceptionLogger;
batch/src/main/java/com/poc/alerting/batch/QueueCreator.java → batch/src/main/java/com/alexjclarke/alerting/batch/QueueCreator.java
+6 -7
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch; package com.alexjclarke.alerting.batch;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
@@ -13,15 +13,14 @@ import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.poc.alerting.amqp.AmqpMessage; import com.alexjclarke.alerting.amqp.AmqpMessage;
import com.poc.alerting.amqp.AmqpResponse; import com.alexjclarke.alerting.amqp.AmqpResponse;
import com.poc.alerting.amqp.ExceptionType; import com.alexjclarke.alerting.amqp.ExceptionType;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static com.poc.alerting.amqp.AmqpConfiguration.AMQP_NAME; import static com.alexjclarke.alerting.amqp.AmqpConfiguration.AMQP_NAME;
import static com.poc.alerting.batch.WorkerConfiguration.NEW_CONSUMER;
@Slf4j @Slf4j
@Component @Component
@@ -60,6 +59,6 @@ public class QueueCreator {
} }
private void sendCreateConsumerMessage(final String queueName) { private void sendCreateConsumerMessage(final String queueName) {
rabbitTemplate.convertAndSend(NEW_CONSUMER, "", queueName); rabbitTemplate.convertAndSend(WorkerConfiguration.NEW_CONSUMER, "", queueName);
} }
} }
batch/src/main/kotlin/com/poc/alerting/batch/AccountWorker.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/AccountWorker.kt
+17 -17
View File
@@ -1,17 +1,17 @@
package com.poc.alerting.batch package com.alexjclarke.alerting.batch
import com.poc.alerting.amqp.AlertingAmqpMessage import com.alexjclarke.alerting.amqp.AlertingAmqpMessage
import com.poc.alerting.amqp.AlertingAmqpMessage.Add import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Add
import com.poc.alerting.amqp.AlertingAmqpMessage.Delete import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Delete
import com.poc.alerting.amqp.AlertingAmqpMessage.Pause import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Pause
import com.poc.alerting.amqp.AlertingAmqpMessage.Resume import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Resume
import com.poc.alerting.amqp.AlertingAmqpMessage.Update import com.alexjclarke.alerting.amqp.AlertingAmqpMessage.Update
import com.poc.alerting.batch.jobs.AlertQueryJob import com.alexjclarke.alerting.batch.jobs.AlertQueryJob
import com.poc.alerting.batch.jobs.AlertQueryJob.Companion.ACCOUNT_ID import com.alexjclarke.alerting.batch.jobs.AlertQueryJob.Companion.ACCOUNT_ID
import com.poc.alerting.batch.jobs.AlertQueryJob.Companion.ALERT_ID import com.alexjclarke.alerting.batch.jobs.AlertQueryJob.Companion.ALERT_ID
import com.poc.alerting.batch.jobs.AlertQueryJob.Companion.CRON import com.alexjclarke.alerting.batch.jobs.AlertQueryJob.Companion.CRON
import com.poc.alerting.persistence.dto.Alert import com.alexjclarke.alerting.persistence.dto.Alert
import com.poc.alerting.persistence.repositories.AlertRepository import com.alexjclarke.alerting.persistence.repositories.AlertRepository
import org.quartz.CronScheduleBuilder import org.quartz.CronScheduleBuilder
import org.quartz.JobBuilder import org.quartz.JobBuilder
import org.quartz.JobDataMap import org.quartz.JobDataMap
@@ -49,7 +49,7 @@ open class AccountWorker @Autowired constructor(
start() start()
} }
return alertRepository.findByExtIdAndAccount_Id(alertId, accountId) return alertRepository.findByExtIdAndAccount_ExtId(alertId, accountId)
} }
private fun updateJob(alertId: String, accountId: String, cron: String): Alert { private fun updateJob(alertId: String, accountId: String, cron: String): Alert {
@@ -58,7 +58,7 @@ open class AccountWorker @Autowired constructor(
} }
private fun deleteJob(alertId: String, accountId: String): Alert { private fun deleteJob(alertId: String, accountId: String): Alert {
val alert = alertRepository.findByExtIdAndAccount_Id(alertId, accountId) val alert = alertRepository.findByExtIdAndAccount_ExtId(alertId, accountId)
scheduler.deleteJob(JobKey.jobKey(alertId, accountId)) scheduler.deleteJob(JobKey.jobKey(alertId, accountId))
alertRepository.delete(alert) alertRepository.delete(alert)
return alert return alert
@@ -66,12 +66,12 @@ open class AccountWorker @Autowired constructor(
private fun pauseJob(alertId: String, accountId: String): Alert { private fun pauseJob(alertId: String, accountId: String): Alert {
scheduler.pauseJob(JobKey.jobKey(alertId, accountId)) scheduler.pauseJob(JobKey.jobKey(alertId, accountId))
return alertRepository.findByExtIdAndAccount_Id(alertId, accountId) return alertRepository.findByExtIdAndAccount_ExtId(alertId, accountId)
} }
private fun resumeJob(alertId: String, accountId: String): Alert { private fun resumeJob(alertId: String, accountId: String): Alert {
scheduler.resumeJob(JobKey.jobKey(alertId, accountId)) scheduler.resumeJob(JobKey.jobKey(alertId, accountId))
return alertRepository.findByExtIdAndAccount_Id(alertId, accountId) return alertRepository.findByExtIdAndAccount_ExtId(alertId, accountId)
} }
private fun buildJob(alertId: String, accountId: String, cron: String): JobDetail { private fun buildJob(alertId: String, accountId: String, cron: String): JobDetail {
batch/src/main/kotlin/com/poc/alerting/batch/AutowiringSpringBeanJobFactory.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/AutowiringSpringBeanJobFactory.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch package com.alexjclarke.alerting.batch
import org.quartz.Job import org.quartz.Job
import org.quartz.SchedulerContext import org.quartz.SchedulerContext
batch/src/main/kotlin/com/poc/alerting/batch/BatchWorker.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/BatchWorker.kt
+2 -2
View File
@@ -1,11 +1,11 @@
package com.poc.alerting.batch package com.alexjclarke.alerting.batch
import org.springframework.boot.Banner import org.springframework.boot.Banner
import org.springframework.boot.WebApplicationType import org.springframework.boot.WebApplicationType
import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.builder.SpringApplicationBuilder import org.springframework.boot.builder.SpringApplicationBuilder
@SpringBootApplication(scanBasePackages = ["com.poc.alerting"]) @SpringBootApplication(scanBasePackages = ["com.alexjclarke.alerting"])
open class BatchWorker open class BatchWorker
fun main(args: Array<String>) { fun main(args: Array<String>) {
batch/src/main/kotlin/com/poc/alerting/batch/ConsumerCreator.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/ConsumerCreator.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.batch package com.alexjclarke.alerting.batch
import org.apache.commons.lang3.time.DateUtils import org.apache.commons.lang3.time.DateUtils
import org.springframework.amqp.rabbit.connection.ConnectionFactory import org.springframework.amqp.rabbit.connection.ConnectionFactory
batch/src/main/kotlin/com/poc/alerting/batch/WorkerConfiguration.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/WorkerConfiguration.kt
+3 -3
View File
@@ -1,7 +1,7 @@
package com.poc.alerting.batch package com.alexjclarke.alerting.batch
import com.poc.alerting.amqp.AmqpConfiguration.Companion.NEW_ACCOUNT import com.alexjclarke.alerting.amqp.AmqpConfiguration.Companion.NEW_ACCOUNT
import com.poc.alerting.amqp.GsonMessageConverter import com.alexjclarke.alerting.amqp.GsonMessageConverter
import org.springframework.amqp.core.Binding import org.springframework.amqp.core.Binding
import org.springframework.amqp.core.BindingBuilder import org.springframework.amqp.core.BindingBuilder
import org.springframework.amqp.core.FanoutExchange import org.springframework.amqp.core.FanoutExchange
batch/src/main/kotlin/com/poc/alerting/batch/jobs/AlertQueryJob.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/jobs/AlertQueryJob.kt
+3 -3
View File
@@ -1,6 +1,6 @@
package com.poc.alerting.batch.jobs package com.alexjclarke.alerting.batch.jobs
import com.poc.alerting.persistence.repositories.AlertRepository import com.alexjclarke.alerting.persistence.repositories.AlertRepository
import org.quartz.Job import org.quartz.Job
import org.quartz.JobExecutionContext import org.quartz.JobExecutionContext
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@@ -24,7 +24,7 @@ open class AlertQueryJob @Autowired constructor(
val cron = data.getString(CRON) val cron = data.getString(CRON)
val accountId = data.getString(ACCOUNT_ID) val accountId = data.getString(ACCOUNT_ID)
val alert = alertRepository.findByExtIdAndAccount_Id(alertId, accountId) val alert = alertRepository.findByExtIdAndAccount_ExtId(alertId, accountId)
with(alert) { with(alert) {
val queryResult = type.query() val queryResult = type.query()
batch/src/main/kotlin/com/poc/alerting/batch/jobs/ScheduleAlertQueryConfiguration.kt → batch/src/main/kotlin/com/alexjclarke/alerting/batch/jobs/ScheduleAlertQueryConfiguration.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package com.poc.alerting.batch.jobs package com.alexjclarke.alerting.batch.jobs
import com.poc.alerting.batch.AutowiringSpringBeanJobFactory import com.alexjclarke.alerting.batch.AutowiringSpringBeanJobFactory
import org.quartz.spi.JobFactory import org.quartz.spi.JobFactory
import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContext
build.gradle.kts
+2 -2
View File
@@ -19,7 +19,7 @@ repositories {
} }
allprojects { allprojects {
group = "com.poc.alerting" group = "com.alexjclarke.alerting"
version = "0.0.1-SNAPSHOT" version = "0.0.1-SNAPSHOT"
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {
@@ -71,5 +71,5 @@ subprojects {
} }
springBoot { springBoot {
mainClass.set("com.poc.alerting.persistence.Persistence") mainClass.set("com.alexjclarke.alerting.persistence.Persistence")
} }
docs/AlertingApi.yaml
+2 -2
View File
@@ -1,10 +1,10 @@
openapi: 3.0.1 openapi: 3.0.1
info: info:
title: Alerting API title: Alerting API
description: 'This is a POC API for a dynamic, reactive alerting system.' description: 'This is a simple API for a dynamic, reactive alerting system (minus the notification component).'
version: 0.0.1 version: 0.0.1
servers: servers:
- url: http://localhost:8080/poc/alerting/v1 - url: http://localhost:8080/api/alerting/v1
tags: tags:
- name: Alerts - name: Alerts
- name: Recipients - name: Recipients
persistence/build.gradle.kts
+1 -1
View File
@@ -23,5 +23,5 @@ flyway {
tasks.getByName<BootJar>("bootJar") { tasks.getByName<BootJar>("bootJar") {
enabled = true enabled = true
mainClass.set("com.poc.alerting.persistence.Persistence") mainClass.set("com.alexjclarke.alerting.persistence.Persistence")
} }
persistence/src/main/kotlin/com/poc/alerting/persistence/H2Config.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/H2Config.kt
+3 -3
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence package com.alexjclarke.alerting.persistence
import org.h2.tools.Server import org.h2.tools.Server
import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.autoconfigure.EnableAutoConfiguration
@@ -9,8 +9,8 @@ import org.springframework.context.annotation.Profile
import org.springframework.data.jpa.repository.config.EnableJpaRepositories import org.springframework.data.jpa.repository.config.EnableJpaRepositories
@Configuration @Configuration
@EnableJpaRepositories("com.poc.alerting.persistence.repositories") @EnableJpaRepositories("com.alexjclarke.alerting.persistence.repositories")
@EntityScan("com.poc.alerting.persistence.dto") @EntityScan("com.alexjclarke.alerting.persistence.dto")
@EnableAutoConfiguration @EnableAutoConfiguration
open class H2Config { open class H2Config {
@Bean(initMethod = "start", destroyMethod = "stop") @Bean(initMethod = "start", destroyMethod = "stop")
persistence/src/main/kotlin/com/poc/alerting/persistence/Persistence.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/Persistence.kt
+2 -2
View File
@@ -1,10 +1,10 @@
package com.poc.alerting.persistence package com.alexjclarke.alerting.persistence
import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication import org.springframework.boot.runApplication
@SpringBootApplication(scanBasePackages = ["com.poc.alerting.persistence"]) @SpringBootApplication(scanBasePackages = ["com.alexjclarke.alerting.persistence"])
open class Persistence open class Persistence
fun main(args: Array<String>) { fun main(args: Array<String>) {
persistence/src/main/kotlin/com/poc/alerting/persistence/dto/Account.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/dto/Account.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence.dto package com.alexjclarke.alerting.persistence.dto
import javax.persistence.Entity import javax.persistence.Entity
import javax.persistence.GeneratedValue import javax.persistence.GeneratedValue
persistence/src/main/kotlin/com/poc/alerting/persistence/dto/Alert.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/dto/Alert.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence.dto package com.alexjclarke.alerting.persistence.dto
import org.hibernate.annotations.CreationTimestamp import org.hibernate.annotations.CreationTimestamp
import org.hibernate.annotations.UpdateTimestamp import org.hibernate.annotations.UpdateTimestamp
persistence/src/main/kotlin/com/poc/alerting/persistence/dto/AlertTypeEnum.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/dto/AlertTypeEnum.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence.dto package com.alexjclarke.alerting.persistence.dto
import kotlin.random.Random import kotlin.random.Random
persistence/src/main/kotlin/com/poc/alerting/persistence/dto/Recipient.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/dto/Recipient.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence.dto package com.alexjclarke.alerting.persistence.dto
import org.hibernate.annotations.CreationTimestamp import org.hibernate.annotations.CreationTimestamp
import org.hibernate.annotations.UpdateTimestamp import org.hibernate.annotations.UpdateTimestamp
persistence/src/main/kotlin/com/poc/alerting/persistence/dto/RecipientTypeEnum.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/dto/RecipientTypeEnum.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.poc.alerting.persistence.dto package com.alexjclarke.alerting.persistence.dto
enum class RecipientTypeEnum { enum class RecipientTypeEnum {
EMAIL, EMAIL,
persistence/src/main/kotlin/com/poc/alerting/persistence/repositories/AccountRepository.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/repositories/AccountRepository.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package com.poc.alerting.persistence.repositories package com.alexjclarke.alerting.persistence.repositories
import com.poc.alerting.persistence.dto.Account import com.alexjclarke.alerting.persistence.dto.Account
import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
persistence/src/main/kotlin/com/poc/alerting/persistence/repositories/AlertRepository.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/repositories/AlertRepository.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package com.poc.alerting.persistence.repositories package com.alexjclarke.alerting.persistence.repositories
import com.poc.alerting.persistence.dto.Alert import com.alexjclarke.alerting.persistence.dto.Alert
import org.springframework.data.repository.CrudRepository import org.springframework.data.repository.CrudRepository
import org.springframework.data.repository.PagingAndSortingRepository import org.springframework.data.repository.PagingAndSortingRepository
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
persistence/src/main/kotlin/com/poc/alerting/persistence/repositories/RecipientRepository.kt → persistence/src/main/kotlin/com/alexjclarke/alerting/persistence/repositories/RecipientRepository.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package com.poc.alerting.persistence.repositories package com.alexjclarke.alerting.persistence.repositories
import com.poc.alerting.persistence.dto.Recipient import com.alexjclarke.alerting.persistence.dto.Recipient
import org.springframework.data.repository.CrudRepository import org.springframework.data.repository.CrudRepository
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
settings.gradle.kts
+1 -1
View File
@@ -1,2 +1,2 @@
rootProject.name = "alerting-poc" rootProject.name = "alerting-api"
include(":persistence", ":amqp", ":api", ":batch") include(":persistence", ":amqp", ":api", ":batch")