Merge branch 'dev'

dina-base-api/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.github.aafc-bicoe</groupId>
     <artifactId>dina-base-parent</artifactId>
-    <version>0.114</version>
+    <version>0.115</version>
   </parent>
 
   <artifactId>dina-base-api</artifactId>
@@ -26,7 +26,7 @@
     <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
     <javers.version>6.13.0</javers.version>
     <mybatis.version>2.2.2</mybatis.version>
-    <aafc.search.messaging.version>0.20</aafc.search.messaging.version>
+    <aafc.search.messaging.version>0.29</aafc.search.messaging.version>
     <hypersistence-utils-hibernate-55.version>3.6.1</hypersistence-utils-hibernate-55.version>
     <postgresql.version>42.4.3</postgresql.version>
     <jsoup.version>1.15.3</jsoup.version>
@@ -144,7 +144,7 @@
     <dependency>
       <groupId>io.github.aafc-bicoe</groupId>
       <artifactId>dina-test-support</artifactId>
-      <version>0.114</version>
+      <version>0.115</version>
       <scope>test</scope>
     </dependency>
     <dependency>

dina-base-api/src/test/java/ca/gc/aafc/dina/service/MessageProducingServiceTest.java

@@ -45,14 +45,11 @@
 
 @SpringBootTest(classes = {TestDinaBaseApp.class, MessageProducingServiceTest.TestConfig.class},
   properties = {
-    "messaging.isProducer=true",
+    "dina.messaging.isProducer=true",
     "rabbitmq.queue=que",
-    "rabbitmq.exchange=exchange",
-    "rabbitmq.routingkey=routingkey",
     "rabbitmq.username=guest",
     "rabbitmq.password=guest",
-    "rabbitmq.host=localhost",
-    "rabbitmq.port=49198"
+    "rabbitmq.host=localhost"
   })
 @ContextConfiguration(initializers = { PostgresTestContainerInitializer.class })
 @DirtiesContext //it's an expensive test and we won't reuse the context
@@ -197,11 +194,10 @@ public static class Listener {
 
       @RabbitListener(bindings = @QueueBinding(
         value = @Queue(value = "que"),
-        exchange = @Exchange(value = "exchange", ignoreDeclarationExceptions = "true"),
-        key = "routingkey"),
+        exchange = @Exchange(value = "que", ignoreDeclarationExceptions = "true")),
         containerFactory = "rabbitListenerContainerFactory"
       )
-      public void processOrder(String data) {
+      public void processMessage(String data) {
         messages.clear();
         messages.add(data);
         latch.countDown();

dina-messaging/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.github.aafc-bicoe</groupId>
     <artifactId>dina-base-parent</artifactId>
-    <version>0.114</version>
+    <version>0.115</version>
   </parent>
 
   <artifactId>dina-messaging</artifactId>

dina-messaging/src/main/java/ca/gc/aafc/dina/messaging/message/DocumentOperationNotification.java

@@ -0,0 +1,52 @@
+package ca.gc.aafc.dina.messaging.message;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import ca.gc.aafc.dina.messaging.DinaMessage;
+
+/**
+ * Class representing a message to indicate a change on a document (JSON document)
+ *
+ */
+@Getter
+public class DocumentOperationNotification implements DinaMessage {
+
+  public static final String NOT_DEFINED = "Not-Defined";
+
+  private final boolean dryRun;
+  private final String documentId;
+  private final String documentType;
+  private final DocumentOperationType operationType;
+
+  public DocumentOperationNotification() {
+    this.dryRun = false;
+    this.documentId = NOT_DEFINED;
+    this.documentType = NOT_DEFINED;
+    this.operationType = DocumentOperationType.NOT_DEFINED;
+  }
+
+  /**
+   * Document operation notification.
+   *
+   * @param dryRun flag denoting if the operation/processing associated with the message should be
+   * bypassed.
+   * @param documentType DINA document type (metadata, person, organization, etc...)
+   * @param documentId The document UUID
+   * @param operationType Operation type as defined by the enumerated type.
+   */
+  @Builder
+  public DocumentOperationNotification(boolean dryRun, String documentType, String documentId,
+                                       DocumentOperationType operationType) {
+    this.dryRun = dryRun;
+    this.documentId = documentId;
+    this.documentType = documentType;
+    this.operationType = operationType;
+  }
+
+  @Override
+  public String toString() {
+    return "DocumentOperationNotification [operationType=" + operationType + ", documentId=" + documentId
+      + ", documentType=" + documentType + ", dryRun=" + dryRun + "]";
+  }
+}

dina-messaging/src/main/java/ca/gc/aafc/dina/messaging/message/DocumentOperationType.java

@@ -0,0 +1,11 @@
+package ca.gc.aafc.dina.messaging.message;
+
+/**
+ * Enumerated type describing the type of operations that can be done to document.
+ */
+public enum DocumentOperationType {
+  NOT_DEFINED,
+  ADD,
+  UPDATE,
+  DELETE;
+}

dina-search/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.github.aafc-bicoe</groupId>
     <artifactId>dina-base-parent</artifactId>
-    <version>0.114</version>
+    <version>0.115</version>
   </parent>
 
   <artifactId>dina-search</artifactId>

dina-search/src/main/java/ca/gc/aafc/dina/search/config/ElasticSearchConfig.java

@@ -13,10 +13,13 @@
 @Configuration
 public class ElasticSearchConfig {
 
+  public static final int DEFAULT_PORT = 9200;
+
   @Bean
   public ElasticsearchClient provideClient(ElasticSearchProperties esProps) {
+    int port = esProps.getPort() <= 0 ? DEFAULT_PORT : esProps.getPort();
     RestClient restClient = RestClient.builder(
-      new HttpHost(esProps.getHost(), esProps.getPort())
+      new HttpHost(esProps.getHost(), port)
     ).build();
 
     // Create the elastic search transport using Jackson and the low level rest client.

dina-search/src/main/java/ca/gc/aafc/dina/search/config/ElasticSearchProperties.java

@@ -21,6 +21,9 @@ public class ElasticSearchProperties {
   @NotBlank
   private String host;
 
+  /**
+   * If not provided the value will be 0
+   */
   private int port;
 
 }

dina-test-support/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>io.github.aafc-bicoe</groupId>
     <artifactId>dina-base-parent</artifactId>
-    <version>0.114</version>
+    <version>0.115</version>
   </parent>
 
   <artifactId>dina-test-support</artifactId>

dina-workbook/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.github.aafc-bicoe</groupId>
     <artifactId>dina-base-parent</artifactId>
-    <version>0.114</version>
+    <version>0.115</version>
   </parent>
 
   <artifactId>dina-workbook</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.aafc-bicoe</groupId>
   <artifactId>dina-base-parent</artifactId>
-  <version>0.114</version>
+  <version>0.115</version>
 
   <packaging>pom</packaging>