Merge pull request #252 from folio-org/master

Downport Community Sprint 6

Author: kaladay

descriptors/ModuleDescriptor-template.json

@@ -418,6 +418,11 @@
         "name": "JAVA_OPTIONS",
         "value": "-XX:MaxRAMPercentage=66.0"
       },
+      { "name": "CAMUNDA_BPM_ADMINUSER_EMAIL", "value": "admin@localhost", "description": "The e-mail address of the Camunda administration user." },
+      { "name": "CAMUNDA_BPM_ADMINUSER_ID", "value": "admin", "description": "The account name of the Camunda administration user." },
+      { "name": "CAMUNDA_BPM_ADMINUSER_PASSWORD", "value": "admin", "description": "The password of the Camunda administration user." },
+      { "name": "CAMUNDA_BPM_DATABASE_SCHEMAUPDATE", "value": "true", "description": "If Camunda should auto-update the BPM database schema." },
+      { "name": "CAMUNDA_BPM_METRICS", "value": "false", "description": "Enable or disable Camunda metrics by default." },
       { "name": "DB_HOST", "value": "postgres" },
       { "name": "DB_PORT", "value": "5432" },
       { "name": "DB_USERNAME", "value": "folio_admin" },
@@ -426,7 +431,16 @@
       { "name": "DB_QUERYTIMEOUT", "value": "60000" },
       { "name": "DB_CHARSET", "value": "UTF-8" },
       { "name": "DB_MAXPOOLSIZE", "value": "16" },
-      { "name": "OKAPI_URL", "value": "http://10.0.2.15:9130", "description": "The URL to the OKAPI service." }
+      { "name": "EVENT_QUEUE_NAME", "value": "event.queue", "description": "The ActiveMQ event queue name." },
+      { "name": "OKAPI_URL", "value": "http://10.0.2.15:9130", "description": "The URL to the OKAPI service." },
+      { "name": "SERVER_PORT", "value": "8081", "description": "The port to listen on that must match the PortBindings." },
+      { "name": "SERVER_SERVLET_CONTEXTPATH", "value": "/", "description": "The context path, or base path, to host at." },
+      { "name": "SPRING_ACTIVEMQ_BROKERURL", "value": "tcp://localhost:61616", "description": "The URL to the ActiveMQ server." },
+      { "name": "SPRING_FLYWAY_ENABLED", "value": "false", "description": "Database migration support via Spring Flyway." },
+      { "name": "SPRING_JPA_HIBERNATE_DDLAUTO", "value": "update", "description": "Auto-configure database on startup." },
+      { "name": "TENANT_DEFAULTTENANT", "value": "diku", "description": "The name of the default tenant to use." },
+      { "name": "TENANT_FORCETENANT", "value": "false", "description": "Forcibly add or overwrite the tenant name using the default tenant." },
+      { "name": "TENANT_INITIALIZEDEFAULTTENANT", "value": "true", "description": "Perform initial auto-creation of tenant in the DB (schema, tables, etc..)." }
     ]
   }
 }

pom.xml

@@ -322,6 +322,26 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
 
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.8</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.hibernate.orm.tooling</groupId>
         <artifactId>hibernate-enhance-maven-plugin</artifactId>

src/main/java/org/folio/rest/camunda/aspect/DelegateExecutionExceptionAspect.java

@@ -32,7 +32,7 @@ public class DelegateExecutionExceptionAspect {
 
   @Autowired
   public DelegateExecutionExceptionAspect(JavaMailSender emailSender) {
-      this.emailSender = emailSender;
+    this.emailSender = emailSender;
   }
 
   @AfterThrowing(pointcut = "execution(* org.camunda.bpm.engine.delegate.JavaDelegate.execute (org.camunda.bpm.engine.delegate.DelegateExecution)) && args(execution))", throwing = "exception")

src/main/java/org/folio/rest/camunda/aspect/TenantInjectionDelegateAspect.java

@@ -18,7 +18,7 @@ public class TenantInjectionDelegateAspect {
 
   @Autowired
   public TenantInjectionDelegateAspect(TenantProperties tenantProperties) {
-      this.tenantProperties = tenantProperties;
+    this.tenantProperties = tenantProperties;
   }
 
   @Before("execution(* org.camunda.bpm.engine.delegate.JavaDelegate.execute (org.camunda.bpm.engine.delegate.DelegateExecution)) && args(execution)")

src/main/java/org/folio/rest/camunda/utility/MappingUtility.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;
-
+import io.vertx.core.json.JsonObject;
 import org.folio.AlternativeTitleType;
 import org.folio.Alternativetitletypes;
 import org.folio.CallNumberType;
@@ -72,44 +72,43 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
-import io.vertx.core.json.JsonObject;
-
 public class MappingUtility {
 
   private static final int SETTING_LIMIT = 1000;
 
-  private static final String IDENTIFIER_TYPES_URL = "/identifier-types?limit=" + SETTING_LIMIT;
-  private static final String CLASSIFICATION_TYPES_URL = "/classification-types?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_TYPES_URL = "/instance-types?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_FORMATS_URL = "/instance-formats?limit=" + SETTING_LIMIT;
-  private static final String CONTRIBUTOR_TYPES_URL = "/contributor-types?limit=" + SETTING_LIMIT;
-  private static final String CONTRIBUTOR_NAME_TYPES_URL = "/contributor-name-types?limit=" + SETTING_LIMIT;
-  private static final String ELECTRONIC_ACCESS_URL = "/electronic-access-relationships?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_NOTE_TYPES_URL = "/instance-note-types?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_ALTERNATIVE_TITLE_TYPES_URL = "/alternative-title-types?limit=" + SETTING_LIMIT;
-  private static final String ISSUANCE_MODES_URL = "/modes-of-issuance?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_STATUSES_URL = "/instance-statuses?limit=" + SETTING_LIMIT;
-  private static final String NATURE_OF_CONTENT_TERMS_URL = "/nature-of-content-terms?limit=" + SETTING_LIMIT;
-  private static final String INSTANCE_RELATIONSHIP_TYPES_URL = "/instance-relationship-types?limit=" + SETTING_LIMIT;
-  private static final String HOLDINGS_TYPES_URL = "/holdings-types?limit=" + SETTING_LIMIT;
-  private static final String HOLDINGS_NOTE_TYPES_URL = "/holdings-note-types?limit=" + SETTING_LIMIT;
-  private static final String ILL_POLICIES_URL = "/ill-policies?limit=" + SETTING_LIMIT;
-  private static final String CALL_NUMBER_TYPES_URL = "/call-number-types?limit=" + SETTING_LIMIT;
-  private static final String STATISTICAL_CODES_URL = "/statistical-codes?limit=" + SETTING_LIMIT;
-  private static final String STATISTICAL_CODE_TYPES_URL = "/statistical-code-types?limit=" + SETTING_LIMIT;
-  private static final String LOCATIONS_URL = "/locations?limit=" + SETTING_LIMIT;
-  private static final String MATERIAL_TYPES_URL = "/material-types?limit=" + SETTING_LIMIT;
-  private static final String ITEM_DAMAGED_STATUSES_URL = "/item-damaged-statuses?limit=" + SETTING_LIMIT;
-  private static final String LOAN_TYPES_URL = "/loan-types?limit=" + SETTING_LIMIT;
-  private static final String ITEM_NOTE_TYPES_URL = "/item-note-types?limit=" + SETTING_LIMIT;
-  private static final String FIELD_PROTECTION_SETTINGS_URL = "/field-protection-settings/marc?limit=" + SETTING_LIMIT;
-
-  private static final RestTemplate restTemplate = new RestTemplate();
-
   private static final MarcToInstanceMapper marcToInstanceMapper = new MarcToInstanceMapper();
 
   private static final ObjectMapper objectMapper = new ObjectMapper();
 
+  static RestTemplate restTemplate = new RestTemplate();
+
+  static final String MAPPING_RULES_URL = "/mapping-rules/marc-bib";
+  static final String IDENTIFIER_TYPES_URL = "/identifier-types?limit=" + SETTING_LIMIT;
+  static final String CLASSIFICATION_TYPES_URL = "/classification-types?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_TYPES_URL = "/instance-types?limit=" + SETTING_LIMIT;
+  static final String ELECTRONIC_ACCESS_URL = "/electronic-access-relationships?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_FORMATS_URL = "/instance-formats?limit=" + SETTING_LIMIT;
+  static final String CONTRIBUTOR_TYPES_URL = "/contributor-types?limit=" + SETTING_LIMIT;
+  static final String CONTRIBUTOR_NAME_TYPES_URL = "/contributor-name-types?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_NOTE_TYPES_URL = "/instance-note-types?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_ALTERNATIVE_TITLE_TYPES_URL = "/alternative-title-types?limit=" + SETTING_LIMIT;
+  static final String NATURE_OF_CONTENT_TERMS_URL = "/nature-of-content-terms?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_STATUSES_URL = "/instance-statuses?limit=" + SETTING_LIMIT;
+  static final String INSTANCE_RELATIONSHIP_TYPES_URL = "/instance-relationship-types?limit=" + SETTING_LIMIT;
+  static final String HOLDINGS_TYPES_URL = "/holdings-types?limit=" + SETTING_LIMIT;
+  static final String HOLDINGS_NOTE_TYPES_URL = "/holdings-note-types?limit=" + SETTING_LIMIT;
+  static final String ILL_POLICIES_URL = "/ill-policies?limit=" + SETTING_LIMIT;
+  static final String CALL_NUMBER_TYPES_URL = "/call-number-types?limit=" + SETTING_LIMIT;
+  static final String STATISTICAL_CODES_URL = "/statistical-codes?limit=" + SETTING_LIMIT;
+  static final String STATISTICAL_CODE_TYPES_URL = "/statistical-code-types?limit=" + SETTING_LIMIT;
+  static final String LOCATIONS_URL = "/locations?limit=" + SETTING_LIMIT;
+  static final String MATERIAL_TYPES_URL = "/material-types?limit=" + SETTING_LIMIT;
+  static final String ITEM_DAMAGED_STATUSES_URL = "/item-damaged-statuses?limit=" + SETTING_LIMIT;
+  static final String LOAN_TYPES_URL = "/loan-types?limit=" + SETTING_LIMIT;
+  static final String ITEM_NOTE_TYPES_URL = "/item-note-types?limit=" + SETTING_LIMIT;
+  static final String FIELD_PROTECTION_SETTINGS_URL = "/field-protection-settings/marc?limit=" + SETTING_LIMIT;
+  static final String ISSUANCE_MODES_URL = "/modes-of-issuance?limit=" + SETTING_LIMIT;
+
   private MappingUtility() {
 
   }
@@ -119,6 +118,7 @@ public static String mapRecordToInsance(String marcJson, String okapiUrl, String
     JsonObject mappingRules = fetchRules(okapiUrl, tenant, token);
     MappingParameters mappingParameters = getMappingParamaters(okapiUrl, tenant, token);
     Instance instance = marcToInstanceMapper.mapRecord(parsedRecord, mappingParameters, mappingRules);
+
     return objectMapper.writeValueAsString(instance);
   }
 
@@ -135,7 +135,7 @@ public static String mapCsvToJson(String csv) throws IOException {
 
   private static JsonObject fetchRules(String okapiUrl, String tenant, String token) {
     HttpEntity<?> entity = new HttpEntity<>(headers(tenant, token));
-    String url = okapiUrl + "/mapping-rules/marc-bib";
+    String url = okapiUrl + MAPPING_RULES_URL;
     ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
     return new JsonObject(response.getBody());
   }
@@ -171,7 +171,7 @@ private static MappingParameters getMappingParamaters(String okapiUrl, String te
       .withItemNoteTypes(getItemNoteTypes(okapiUrl, headers))
       .withMarcFieldProtectionSettings(getMarcFieldProtectionSettings(okapiUrl, headers));
   }
-  
+
   private static List<IdentifierType> getIdentifierTypes(String okapiUrl, HttpHeaders headers) {
     HttpEntity<Identifiertypes> entity = new HttpEntity<>(headers);
     String url = okapiUrl + IDENTIFIER_TYPES_URL;

src/main/java/org/folio/rest/camunda/utility/MarcUtility.java

@@ -43,7 +43,7 @@ public class MarcUtility {
 
   private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
-  private static final ObjectMapper mapper = new ObjectMapper();
+  protected static final ObjectMapper mapper = new ObjectMapper();
 
   private MarcUtility() {
 
@@ -154,7 +154,7 @@ public static String getFieldsFromMarcJson(String marcJson, String[] tags)
 
   private static Record marcJsonToRecord(String marcJson)
       throws MarcException, IOException {
-    logger.info("Attempting to read MARC JSON to Record: {}", marcJson);
+    logger.debug("Attempting to read MARC JSON to Record: {}", marcJson);
     try (InputStream in = new ByteArrayInputStream(marcJson.getBytes())) {
       final MarcJsonReader reader = new MarcJsonReader(in);
       if (reader.hasNext()) {
@@ -167,7 +167,7 @@ private static Record marcJsonToRecord(String marcJson)
 
   private static Record rawMarcToRecord(String rawMarc)
       throws MarcException, IOException {
-    logger.info("Attempting to read raw MARC to Record: {}", rawMarc);
+    logger.debug("Attempting to read raw MARC to Record: {}", rawMarc);
     try (InputStream in = new ByteArrayInputStream(rawMarc.getBytes(DEFAULT_CHARSET))) {
       final MarcStreamReader reader = new MarcStreamReader(in, DEFAULT_CHARSET.name());
       if (reader.hasNext()) {

src/main/resources/application.yaml

@@ -13,7 +13,7 @@ logging:
       springframework: INFO
 
 server:
-  port: 9000
+  port: 8081
   servlet:
     context-path: /
     encoding:
@@ -55,7 +55,7 @@ spring:
     password: ${DB_PASSWORD:folio_admin}
 
   flyway:
-    enabled: true
+    enabled: false
     encoding: UTF-8
 
   h2:
@@ -71,7 +71,7 @@ spring:
 
     properties.hibernate.jdbc.lob.non_contextual_creation: true
     generate-ddl: false
-    hibernate.ddl-auto: none
+    hibernate.ddl-auto: update
     open-in-view: true
     show-sql: false
 
@@ -102,7 +102,7 @@ camunda:
   bpm:
     auto-deployment-enabled: false
     database:
-      schema-update: false
+      schema-update: true
     filter:
       create: All Tasks
     admin-user:
@@ -157,13 +157,23 @@ tenant:
   # https://github.com/camunda/camunda-bpm-platform/tree/master/engine/src/main/resources/org/camunda/bpm/engine/db/create
   # be sure to match datasource platform
   schema-scripts:
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.history.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.identity.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.case.engine.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.case.history.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.decision.engine.sql
-    - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.decision.history.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.engine.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.history.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.identity.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.case.engine.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.case.history.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.decision.engine.sql
+    - classpath:/org/camunda/bpm/engine/db/create/activiti.postgres.create.decision.history.sql
+
+  # H2 schema scripts.
+  #schema-scripts:
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.history.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.identity.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.case.engine.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.case.history.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.decision.engine.sql
+  #  - classpath:/org/camunda/bpm/engine/db/create/activiti.h2.create.decision.history.sql
 
 okapi.url: ${OKAPI_URL:http://localhost:9130}
 

src/test/java/org/folio/rest/camunda/aspect/DelegateExecutionExceptionAspectTest.java

@@ -0,0 +1,82 @@
+package org.folio.rest.camunda.aspect;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.camunda.bpm.engine.ProcessEngineServices;
+import org.camunda.bpm.engine.RepositoryService;
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.camunda.bpm.engine.repository.ProcessDefinition;
+import org.camunda.bpm.engine.repository.ProcessDefinitionQuery;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@ExtendWith(SpringExtension.class)
+@ExtendWith(MockitoExtension.class)
+class DelegateExecutionExceptionAspectTest {
+
+  @Mock
+  private JavaMailSender emailSender;
+
+  @Mock
+  private DelegateExecution execution;
+
+  @Mock
+  private RepositoryService repositoryService;
+
+  @Mock
+  private ProcessEngineServices processEngineServices;
+
+  @Mock
+  private ProcessDefinitionQuery processDefinitionQuery;
+
+  @Mock
+  private ProcessDefinition processDefinition;
+
+  @Mock
+  private StackTraceElement stackTraceElement;
+
+  @Mock
+  private Throwable exception;
+
+  @InjectMocks
+  private DelegateExecutionExceptionAspect delegateExecutionExceptionAspect;
+
+  @Test
+  void testAfterDelegateExecutionThrowsException() {
+    ReflectionTestUtils.setField(delegateExecutionExceptionAspect, "errorHandlingEnvironment", "DEV");
+    ReflectionTestUtils.setField(delegateExecutionExceptionAspect, "errorHandlingEmailFrom", "helpdesk@library.tamu.edu");
+    ReflectionTestUtils.setField(delegateExecutionExceptionAspect, "errorHandlingEmailTo", "helpdesk@library.tamu.edu");
+
+    when(execution.getCurrentActivityName()).thenReturn("taskName");
+    when(execution.getTenantId()).thenReturn("tenant");
+    when(execution.getProcessDefinitionId()).thenReturn("id");
+    when(processDefinition.getName()).thenReturn("workflowName");
+    when(processDefinitionQuery.singleResult()).thenReturn(processDefinition);
+
+    when(processDefinitionQuery.processDefinitionId(execution.getProcessDefinitionId())).thenReturn(processDefinitionQuery);
+
+    when(repositoryService.createProcessDefinitionQuery()).thenReturn(processDefinitionQuery);
+    when(processEngineServices.getRepositoryService()).thenReturn(repositoryService);
+    when(execution.getProcessEngineServices()).thenReturn(processEngineServices);
+
+    when(exception.getStackTrace()).thenReturn(new StackTraceElement[] { stackTraceElement });
+    when(stackTraceElement.toString()).thenReturn("");
+
+    doNothing().when(emailSender).send(any(SimpleMailMessage.class));
+
+    delegateExecutionExceptionAspect.afterDelegateExecutionThrowsException(execution, exception);
+
+    verify(emailSender).send(any(SimpleMailMessage.class));
+  }
+
+}