From 8e670df6eb63bc07cd785737ae5af05d35c858ec Mon Sep 17 00:00:00 2001
From: Dominik Pilar <xpilar3@fi.muni.cz>
Date: Tue, 16 Feb 2021 09:35:40 +0100
Subject: [PATCH] Added elasticsearch audit configuration.
---
.../training/adaptive/DemoApplication.java | 8 +++-
.../ObjectMapperConfigElasticsearch.java | 2 +-
...icsearchTrainingServiceLayerException.java | 41 +++++++++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
index 983d9e46..c15a1141 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java
@@ -1,12 +1,18 @@
package cz.muni.ics.kypo.training.adaptive;
import cz.muni.ics.kypo.commons.startup.config.MicroserviceRegistrationConfiguration;
+import cz.muni.ics.kypo.training.adaptive.config.ObjectMapperConfigElasticsearch;
+import cz.muni.ics.kypo.training.adaptive.config.ValidationMessagesConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
@SpringBootApplication
-@Import(value = {MicroserviceRegistrationConfiguration.class})
+@Import(value = {
+ MicroserviceRegistrationConfiguration.class,
+ ValidationMessagesConfig.class,
+ ObjectMapperConfigElasticsearch.class
+})
public class DemoApplication {
public static void main(String[] args) {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
index 0da28da4..a98bf408 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/ObjectMapperConfigElasticsearch.java
@@ -1,4 +1,4 @@
-package cz.muni.csirt.kypo.elasticsearch.service.config;
+package cz.muni.ics.kypo.training.adaptive.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java
new file mode 100644
index 00000000..3c43ee11
--- /dev/null
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/exceptions/ElasticsearchTrainingServiceLayerException.java
@@ -0,0 +1,41 @@
+package cz.muni.ics.kypo.training.adaptive.exceptions;
+
+/**
+ * The type Elasticsearch training service layer exception.
+ */
+public class ElasticsearchTrainingServiceLayerException extends RuntimeException {
+
+ /**
+ * Instantiates a new Elasticsearch training service layer exception.
+ */
+ public ElasticsearchTrainingServiceLayerException() {
+ }
+
+ /**
+ * Instantiates a new Elasticsearch training service layer exception.
+ *
+ * @param message the message
+ */
+ public ElasticsearchTrainingServiceLayerException(String message) {
+ super(message);
+ }
+
+ /**
+ * Instantiates a new Elasticsearch training service layer exception.
+ *
+ * @param message the message
+ * @param ex the exception
+ */
+ public ElasticsearchTrainingServiceLayerException(String message, Throwable ex) {
+ super(message, ex);
+ }
+
+ /**
+ * Instantiates a new Elasticsearch training service layer exception.
+ *
+ * @param ex the exception
+ */
+ public ElasticsearchTrainingServiceLayerException(Throwable ex) {
+ super(ex);
+ }
+}
--
GitLab