Commit 31517e1d authored by Enriko Käsper's avatar Enriko Käsper
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/scheduler-service!15
parents c3696dad 3ab19089
theGroup=ee.sm.ti.teis
theVersion=1.5.0
theVersion=1.6.0
commonsVersion=1.5.1
commonApiGatewayVersion=1.5.1
adminApiGatewayVersion=1.3.0
......
......@@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.*;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.*;
@Service
@Slf4j
......
......@@ -5,14 +5,14 @@ import ee.sm.ti.teis.scheduler.config.QueueConfig;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
import ee.sm.ti.teis.scheduler.message.SystemJobFinishedRequest;
import ee.sm.ti.teis.scheduler.message.SystemJobStartedRequest;
import ee.sm.ti.teis.scheduler.processor.camunda.MessageCorrelationService;
import ee.sm.ti.teis.scheduler.processor.bpm.MessageCorrelationService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.camunda.bpm.engine.MismatchingMessageCorrelationException;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.*;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.*;
import static java.text.MessageFormat.format;
@Component
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
import ee.sm.ti.teis.scheduler.processor.JobProcessingService;
......@@ -7,7 +7,7 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.delegate.JavaDelegate;
import org.springframework.stereotype.Component;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
@Slf4j
@Component
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
import ee.sm.ti.teis.scheduler.processor.JobProcessingService;
......@@ -8,7 +8,7 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.delegate.JavaDelegate;
import org.springframework.stereotype.Component;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
@Slf4j
@Component
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
import ee.sm.ti.teis.scheduler.processor.JobProcessingService;
......@@ -8,7 +8,7 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.delegate.JavaDelegate;
import org.springframework.stereotype.Component;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
@Slf4j
@Component
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.exceptions.TeisIllegalArgumentException;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
......@@ -11,7 +11,7 @@ import org.springframework.retry.annotation.Backoff;
import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static java.text.MessageFormat.format;
@Service
......
package ee.sm.ti.teis.scheduler.processor.camunda;
package ee.sm.ti.teis.scheduler.processor.bpm;
import ee.sm.ti.teis.scheduler.domain.SystemJob;
import ee.sm.ti.teis.scheduler.processor.JobProcessingService;
......@@ -8,7 +8,7 @@ import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.delegate.JavaDelegate;
import org.springframework.stereotype.Component;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.SYSTEM_JOB_VARIABLE_NAME;
@Slf4j
@Component
......
......@@ -15,7 +15,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import static ee.sm.ti.teis.scheduler.processor.camunda.JobProcessInstanceContext.EXECUTE_JOB_MESSAGE_ID;
import static ee.sm.ti.teis.scheduler.processor.bpm.JobProcessInstanceContext.EXECUTE_JOB_MESSAGE_ID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.camunda.bpm.extension.mockito.CamundaMockito.autoMock;
import static org.junit.jupiter.api.Assertions.assertThrows;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment