Skip to content
GitLab
Commit 317299a1 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/officials-service!47
parents 033d4aea 9d40caeb
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md 0 → 100644
View file @ 317299a1
# Changelog
## [1.9.0] - 2020-10-30
* removed Camunda BPMN dependency
* updated Spring Boot framework to version 2.3.4.RELEASE
* updated teis-gradle-plugin version to latest which contains different Gradle dependency configuration sets (functionalities) and therefore Gradle configuration was stripped down from microservice configuration
* updated Gradle Wrapper to version 5.6.4
\ No newline at end of file
build.gradle
View file @ 317299a1
......@@ -56,12 +56,8 @@ allprojects {
}
dependencies {
// TeIS
compile "ee.sm.ti.teis:office-api-gateway-lib:${officeApiGatewayVersion}"
compile "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
compile "ee.sm.ti.teis:domain-request-lib:${commonsVersion}"
compile "ee.sm.ti.teis:domain-cache-lib:${commonsVersion}"
compile("com.querydsl:querydsl-core:${querydslVersion}")
compile("com.querydsl:querydsl-jpa:${querydslVersion}")
}
}
gradle.properties
View file @ 317299a1
theGroup=ee.sm.ti.teis
theVersion=1.8.0
commonsVersion=1.10.0
officeApiGatewayVersion=1.8.0
pluginVersion=1.1.1
mapstructVersion=1.3.0.Final
querydslVersion=4.1.3
theVersion=1.9.0
commonsVersion=1.14.0
officeApiGatewayVersion=1.14.0
pluginVersion=1.2.0
gradle/wrapper/gradle-wrapper.properties
View file @ 317299a1
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.tehik.ee/artifactory/gradle-distributions/gradle-5.2.1-all.zip
distributionUrl=https\://repo.tehik.ee/artifactory/gradle-distributions/gradle-5.6.4-bin.zip
service/build.gradle
View file @ 317299a1
......@@ -8,32 +8,6 @@ functionalities {
apply from: this.getClass().getClassLoader().getResource('teis.integrationTest.gradle')
apply from: this.getClass().getClassLoader().getResource('teis.microservice.gradle')
dependencies {
// Spring
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-data-jpa"
compile "org.springframework.boot:spring-boot-starter-amqp"
compile 'org.springframework.boot:spring-boot-starter-actuator'
compile 'org.springframework.boot:spring-boot-starter-security'
compile 'org.springframework.security:spring-security-config'
// BPM
compile "org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp:3.2.1"
// Annotation processors
annotationProcessor (
"org.mapstruct:mapstruct-processor:${mapstructVersion}",
"com.querydsl:querydsl-apt:${querydslVersion}:jpa",
"org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final",
"javax.annotation:javax.annotation-api:1.3.2"
)
// Tests
testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
// Misc
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
}
// Define the main class for the application
mainClassName = 'ee.sm.ti.teis.OfficialsServiceApp'
......
service/src/integTest/java/ee/sm/ti/teis/OfficialsAppTestBase.java
View file @ 317299a1
......@@ -5,7 +5,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.util.TestPropertyValues;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
......@@ -16,15 +15,14 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@SpringBootTest(classes = OfficialsServiceApp.class)
@ActiveProfiles("integtest")
@Testcontainers
@DirtiesContext
@ContextConfiguration(initializers = {OfficialsAppTestBase.Initializer.class})
public abstract class OfficialsAppTestBase {
private static final GenericContainer rabbitMQContainer;
private static final GenericContainer<?> rabbitMQContainer;
// to speed up tests, lets use static container, it is used in all test classes that are executed inside one Spring Context
static {
rabbitMQContainer = new GenericContainer("rabbitmq:latest").withExposedPorts(5672);
rabbitMQContainer = new GenericContainer<>("rabbitmq:latest").withExposedPorts(5672);
rabbitMQContainer.start();
}
......
service/src/integTest/resources/application-integtest.yaml
View file @ 317299a1
......@@ -11,8 +11,3 @@ spring:
password: seis
change-log: classpath:/db/changelog/db.changelog-integtest.xml
contexts: integtest
camunda:
bpm:
admin-user:
id: kermit
password: superSecret
service/src/integTest/resources/db/changelog/integtest-setup.sql
View file @ 317299a1
......@@ -3,4 +3,3 @@
--changeset raigo:integtest_setup
CREATE USER teis;
CREATE SCHEMA cache;
CREATE SCHEMA camunda;
service/src/main/java/ee/sm/ti/teis/OfficialsServiceApp.java
View file @ 317299a1
......@@ -9,13 +9,11 @@ import ee.sm.ti.teis.configuration.QueueConfigurator;
import ee.sm.ti.teis.servicecommon.config.DataSourceConfig;
import ee.sm.ti.teis.servicecommon.config.JpaAuditingConfiguration;
import ee.sm.ti.teis.servicecommon.config.PropertyLogger;
import org.camunda.bpm.spring.boot.starter.annotation.EnableProcessApplication;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
@SpringBootApplication
@EnableProcessApplication
@Import({JpaAuditingConfiguration.class, PropertyLogger.class, ExchangeConfig.class, QueueConfigurator.class, RabbitListenerAspect.class, DataSourceConfig.class})
public class OfficialsServiceApp {
......
service/src/main/java/ee/sm/ti/teis/officials/config/CacheConfig.java deleted 100644 → 0
View file @ 033d4aea
package ee.sm.ti.teis.officials.config;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
@Configuration
@EnableCaching
@Profile("!integtest")
public class CacheConfig {
}
service/src/main/java/ee/sm/ti/teis/officials/test/ResetTestDataListener.java deleted 100644 → 0
View file @ 033d4aea
package ee.sm.ti.teis.officials.test;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import static ee.sm.ti.teis.servicecommon.util.TestDataImportService.*;
@Service
@RequiredArgsConstructor
@Profile({"dev", "local", "test"})
public class ResetTestDataListener {
private final TestDataImportService testDataImportService;
@RabbitListener(queues = {"officials-service" + RESET_TEST_DATA_QUEUE_SUFFIX})
public void resetTestData(String providedMagicString) {
testDataImportService.resetTestData(providedMagicString);
}
}
service/src/main/resources/META-INF/processes.xml deleted 100644 → 0
View file @ 033d4aea
<process-application
xmlns="http://www.camunda.org/schema/1.0/ProcessApplication">
<process-archive>
<process-engine>default</process-engine>
</process-archive>
</process-application>
\ No newline at end of file
service/src/main/resources/application-local.sample.yaml
View file @ 317299a1
......@@ -11,11 +11,6 @@ spring:
port: 5672
username: guest
password: guest
camunda:
bpm:
admin-user:
id: kermit
password: superSecret
# Change Tomcat port locally. Default is 8080
#server:
......
service/src/main/resources/application.yaml
View file @ 317299a1
logging.config: classpath:common/logback-spring.xml
camunda:
bpm:
webapp:
index-redirect-enabled: false
admin-user:
id: ${CAMUNDA_ADMIN_USER_ID}
password: ${CAMUNDA_ADMIN_PASSWORD}
job-execution:
# Set values to 1000 and 50, when Camunda is actually in use. In this case the new jobs will be queried in each second.
max-wait: 6000000
# wait-time-in-millis: 50
database:
schema-update: false
schema-name: camunda
table-prefix: camunda.
spring:
profiles:
active: ${ENV_GLOBAL_PROFILES:local},${ENV_APP_PROFILES:app}
......@@ -35,7 +19,7 @@ spring:
parameters:
db_app_username: ${DB_APP_USERNAME:teis}
jpa:
database-platform: org.hibernate.dialect.PostgreSQL82Dialect
database-platform: org.hibernate.dialect.PostgreSQL10Dialect
properties:
hibernate:
jdbc:
......@@ -61,6 +45,8 @@ management:
info.enabled: true
teis:
datasource:
packages-to-scan: ee.sm.ti.teis
system:
name: officials-service
test:
......@@ -73,4 +59,8 @@ teis:
ms-exchange-reply-timeout: ${RABBIT_TEMPLATE_MS_EXCHANGE_REPLY_TIMEOUT:5000}
cs-exchange-name: cache_exchange
od-exchange-name: od-disabled
cache: classifierItems, classifierDefinitions
cache:
queues: classifierItems, classifierDefinitions
reinitialize: OfficialsGroup, OfficialUser, Office
reset-test-data:
enabled: true
service/src/main/resources/db/changelog/data/9999-00-00.import-test-data.sql
View file @ 317299a1
--liquibase formatted sql
/* @formatter:off */
--changeset raigo:import_test_data runAlways:false runOnChange:true context:local,dev,integtest,test
DELETE FROM cache.cache_classifier_item;
DELETE from officials_group_emtak;
DELETE from official_user;
DELETE from officials_group;
DELETE FROM officials_group_emtak;
DELETE FROM official_user;
DELETE FROM officials_group;
insert into officials_group (id, name, object_status, officials_group_manager_id)
VALUES
('ffb124d3-ce51-45e2-b8e5-343d11066998', 'TEIS kasutajad', 'CURRENT', '3dac227f-a8af-4771-8d8b-01409ac7fef0'),
('68b5b265-9427-457f-8f16-0bd5cf608714', 'Admin kasutajad', 'CURRENT', 'b5d59f3b-57af-4971-8110-51019e5e827d'),
('751f8528-64a5-4e0e-862a-549356014861', 'Test Group', 'CURRENT', null),
('706bc212-ac68-4160-9c4b-7497a2de3430', 'Automaattestide Group', 'CURRENT', 'b429d838-758b-4ddd-b843-b6242675986f'),
('017b41a4-1871-4e00-9a36-cd27adbc1f5a', 'Valdkonnas pole managerit', 'CURRENT', null),
('c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'Admin kasutajad (removed)', 'DELETED', '2d2aa827-d92a-4f77-af3c-a9537ba31d7b');
VALUES ('ffb124d3-ce51-45e2-b8e5-343d11066998', 'TEIS kasutajad', 'CURRENT', '3dac227f-a8af-4771-8d8b-01409ac7fef0'),
('68b5b265-9427-457f-8f16-0bd5cf608714', 'Admin kasutajad', 'CURRENT', 'b5d59f3b-57af-4971-8110-51019e5e827d'),
('751f8528-64a5-4e0e-862a-549356014861', 'Test Group', 'CURRENT', null),
('706bc212-ac68-4160-9c4b-7497a2de3430', 'Automaattestide Group', 'CURRENT', 'b429d838-758b-4ddd-b843-b6242675986f'),
('017b41a4-1871-4e00-9a36-cd27adbc1f5a', 'Valdkonnas pole managerit', 'CURRENT', null),
('c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'Admin kasutajad (removed)', 'DELETED', '2d2aa827-d92a-4f77-af3c-a9537ba31d7b');
insert into official_user (id, id_code, first_name, last_name, officials_group_id, object_status)
VALUES
('3dac227f-a8af-4771-8d8b-01409ac7fef0', '38909120274', 'Esimene', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('e0ee766d-4332-450a-9d9c-9835ae663d96', '49206110158', 'Teine', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('620437e0-3b57-48fc-bc40-5adcfd994638', '37802170149', 'Kolmas', 'Test-Kasutaja', null, 'CURRENT'),
('b429d838-758b-4ddd-b843-b6242675986f', '38802170149', 'Neljas', 'Test-Kasutaja', '706bc212-ac68-4160-9c4b-7497a2de3430', 'CURRENT'),
('b5d59f3b-57af-4971-8110-51019e5e827d', '49206111928', 'Admin', 'Test-Kasutaja', '68b5b265-9427-457f-8f16-0bd5cf608714', 'CURRENT'),
('5d74e9ca-c0f4-40b5-85dd-6fbe5eb6a1a2', '47501020304', 'Kustutatud gruppi', 'Test-Kasutaja', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'CURRENT'),
('2d2aa827-d92a-4f77-af3c-a9537ba31d7b', '48506111928', 'Kustutatud', 'Test-Kasutaja', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'DELETED'),
('ebfffc90-72d0-4c0b-ab5e-1955e996fd28', '48506111922', 'Kustutatud Grupi', 'Test-Kustutatud Manager', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'DELETED'),
('be01b415-86a5-4f4c-b1f2-2c065715b221', '48606111928', 'Kustutatud Teine', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'DELETED'),
('06fe678a-90a8-49a7-8362-1041d244ef90', '60001018800', 'TeIS', 'Test1', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('f0cafdc3-ff43-4c73-8319-93f07a7d5a3c', '50001018865', 'TeIS', 'Test2', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('cb75bfe0-e543-4332-97d5-e21ac92debe8', '48501019907', 'Automaattestide', 'Test-Kasutaja', null, 'CURRENT'),
('c5d7ab7d-182c-47d3-828a-5b7447b3584f', '60001019906', 'TeIS', 'Test3', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('a6e007a3-564d-40ed-b48b-a03a92be18af', '48201019101', 'Marina', 'Test-Ivanova', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('eb13c9af-3445-4bb3-9304-105112525b5c', '48301019202', 'Kätlin', 'Test-Košmõžäköüina', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('7948cf23-e9a8-45fd-a3c8-03ba38694948', '38101019303', 'Александр', 'Test-Мороз', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('45365695-90fa-41af-96c9-449cb4c1fcaf', '38001019404', 'Peeter', 'Test-Tubli', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('6d497ad4-91cf-43f3-95b9-06b777ce7c44', '48501019505', 'Maris-Liis', 'Test-Zorro', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('109a3a67-c02d-4836-adff-cb73915fd110', '48601019606', 'Märt', 'Test-Lindpere', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT');
VALUES ('3dac227f-a8af-4771-8d8b-01409ac7fef0', '38909120274', 'Esimene', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('e0ee766d-4332-450a-9d9c-9835ae663d96', '49206110158', 'Teine', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('620437e0-3b57-48fc-bc40-5adcfd994638', '37802170149', 'Kolmas', 'Test-Kasutaja', null, 'CURRENT'),
('b429d838-758b-4ddd-b843-b6242675986f', '38802170149', 'Neljas', 'Test-Kasutaja', '706bc212-ac68-4160-9c4b-7497a2de3430', 'CURRENT'),
('b5d59f3b-57af-4971-8110-51019e5e827d', '49206111928', 'Admin', 'Test-Kasutaja', '68b5b265-9427-457f-8f16-0bd5cf608714', 'CURRENT'),
('5d74e9ca-c0f4-40b5-85dd-6fbe5eb6a1a2', '47501020304', 'Kustutatud gruppi', 'Test-Kasutaja', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'CURRENT'),
('2d2aa827-d92a-4f77-af3c-a9537ba31d7b', '48506111928', 'Kustutatud', 'Test-Kasutaja', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'DELETED'),
('ebfffc90-72d0-4c0b-ab5e-1955e996fd28', '48506111922', 'Kustutatud Grupi', 'Test-Kustutatud Manager', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'DELETED'),
('be01b415-86a5-4f4c-b1f2-2c065715b221', '48606111928', 'Kustutatud Teine', 'Test-Kasutaja', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'DELETED'),
('06fe678a-90a8-49a7-8362-1041d244ef90', '60001018800', 'TeIS', 'Test1', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('f0cafdc3-ff43-4c73-8319-93f07a7d5a3c', '50001018865', 'TeIS', 'Test2', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('cb75bfe0-e543-4332-97d5-e21ac92debe8', '48501019907', 'Automaattestide', 'Test-Kasutaja', null, 'CURRENT'),
('c5d7ab7d-182c-47d3-828a-5b7447b3584f', '60001019906', 'TeIS', 'Test3', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('a6e007a3-564d-40ed-b48b-a03a92be18af', '48201019101', 'Marina', 'Test-Ivanova', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('eb13c9af-3445-4bb3-9304-105112525b5c', '48301019202', 'Kätlin', 'Test-Košmõžäköüina', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('7948cf23-e9a8-45fd-a3c8-03ba38694948', '38101019303', 'Александр', 'Test-Мороз', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('45365695-90fa-41af-96c9-449cb4c1fcaf', '38001019404', 'Peeter', 'Test-Tubli', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('6d497ad4-91cf-43f3-95b9-06b777ce7c44', '48501019505', 'Maris-Liis', 'Test-Zorro', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT'),
('109a3a67-c02d-4836-adff-cb73915fd110', '48601019606', 'Märt', 'Test-Lindpere', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'CURRENT');
insert into officials_group_emtak (id, officials_group_id, emtak, object_status)
VALUES
('77c7267a-0069-4c02-9d6b-14d019a16c12', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0113', 'CURRENT'),
('55782f14-93d3-468e-a5ac-f98c2a078cad', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0121', 'CURRENT'),
('afe146b3-7c57-4d90-be16-ed1f944bd181', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0115', 'DELETED'),
('b174d4f0-7129-4e17-bd8e-88e85b7eb08b', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'EMTAK__0121', 'CURRENT'),
('d8fd1fef-9043-4d8d-a743-ec1ee91c1536', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'EMTAK__45', 'CURRENT'),
('b92e4ad4-52aa-4444-b34b-e3cd2ea70102', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'EMTAK__88', 'CURRENT'),
('c9880c6b-6d41-489a-b9e8-d259e591b7df', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__88', 'CURRENT');
VALUES ('77c7267a-0069-4c02-9d6b-14d019a16c12', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0113', 'CURRENT'),
('55782f14-93d3-468e-a5ac-f98c2a078cad', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0121', 'CURRENT'),
('afe146b3-7c57-4d90-be16-ed1f944bd181', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__0115', 'DELETED'),
('b174d4f0-7129-4e17-bd8e-88e85b7eb08b', 'c6bbd0d0-a614-408e-b22b-c60eed1a0dc9', 'EMTAK__0121', 'CURRENT'),
('d8fd1fef-9043-4d8d-a743-ec1ee91c1536', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'EMTAK__45', 'CURRENT'),
('b92e4ad4-52aa-4444-b34b-e3cd2ea70102', 'ffb124d3-ce51-45e2-b8e5-343d11066998', 'EMTAK__88', 'CURRENT'),
('c9880c6b-6d41-489a-b9e8-d259e591b7df', '751f8528-64a5-4e0e-862a-549356014861', 'EMTAK__88', 'CURRENT');
service/src/main/resources/db/changelog/db.changelog-master.xml
View file @ 317299a1
......@@ -5,7 +5,6 @@
<include file="classpath:common/db/changelog/common-master.xml"/>
<includeAll path="domain" relativeToChangelogFile="true" />
<include file="classpath:db/changelog/cache-master.xml" />
<include file="classpath:common/db/changelog/camunda-7-10.xml" />
<includeAll path="data" relativeToChangelogFile="true" />
</databaseChangeLog>
service/src/main/resources/exampleProcess.bpmn deleted 100644 → 0
View file @ 033d4aea
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0aysxks" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
<bpmn:process id="Process_1" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" camunda:asyncBefore="true" camunda:exclusive="false">
<bpmn:outgoing>SequenceFlow_0z26bx8</bpmn:outgoing>
<bpmn:messageEventDefinition messageRef="Message_0lf05zp" />
</bpmn:startEvent>
<bpmn:sequenceFlow id="SequenceFlow_0z26bx8" sourceRef="StartEvent_1" targetRef="Task_147od7p" />
<bpmn:sequenceFlow id="SequenceFlow_0j7j5vr" sourceRef="Task_147od7p" targetRef="Task_1tzxzz2" />
<bpmn:sequenceFlow id="SequenceFlow_04am1uf" sourceRef="Task_1tzxzz2" targetRef="EndEvent_13zxbrp" />
<bpmn:endEvent id="EndEvent_13zxbrp">
<bpmn:incoming>SequenceFlow_04am1uf</bpmn:incoming>
<bpmn:messageEventDefinition camunda:delegateExpression="#{successEventAdapter}" />
</bpmn:endEvent>
<bpmn:boundaryEvent id="BoundaryEvent_1twn145" attachedToRef="Task_1tzxzz2">
<bpmn:outgoing>SequenceFlow_1v8uiu7</bpmn:outgoing>
<bpmn:errorEventDefinition errorRef="Error_00ibvhs" />
</bpmn:boundaryEvent>
<bpmn:sequenceFlow id="SequenceFlow_1v8uiu7" sourceRef="BoundaryEvent_1twn145" targetRef="IntermediateThrowEvent_1qs7w8u" />
<bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1qs7w8u">
<bpmn:incoming>SequenceFlow_1v8uiu7</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1v3brq5</bpmn:outgoing>
<bpmn:compensateEventDefinition />
</bpmn:intermediateThrowEvent>
<bpmn:sequenceFlow id="SequenceFlow_1v3brq5" sourceRef="IntermediateThrowEvent_1qs7w8u" targetRef="EndEvent_0tw6fo0" />
<bpmn:endEvent id="EndEvent_0tw6fo0">
<bpmn:incoming>SequenceFlow_1v3brq5</bpmn:incoming>
<bpmn:messageEventDefinition camunda:delegateExpression="#{errorEventAdapter}" />
</bpmn:endEvent>
<bpmn:boundaryEvent id="BoundaryEvent_05nns77" attachedToRef="Task_147od7p">
<bpmn:compensateEventDefinition />
</bpmn:boundaryEvent>
<bpmn:serviceTask id="Task_1tzxzz2" name="Activity 2" camunda:delegateExpression="#{activity2Adapter}">
<bpmn:incoming>SequenceFlow_0j7j5vr</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_04am1uf</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:serviceTask id="Task_147od7p" name="Activity 1" camunda:delegateExpression="#{activity1Adapter}">
<bpmn:incoming>SequenceFlow_0z26bx8</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0j7j5vr</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:serviceTask id="Task_07yeeeh" name="Compensation 1" isForCompensation="true" camunda:delegateExpression="#{compensation1Adapter}" />
<bpmn:association id="Association_0fhoe83" associationDirection="One" sourceRef="BoundaryEvent_05nns77" targetRef="Task_07yeeeh" />
</bpmn:process>
<bpmn:message id="Message_0l0xy0f" name="ProcessingFailed" />
<bpmn:message id="Message_0lf05zp" name="CertificationsInserted" />
<bpmn:error id="Error_00ibvhs" name="Random Error" errorCode="102" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
<bpmndi:BPMNShape id="StartEvent_1m2qkh7_di" bpmnElement="StartEvent_1">
<dc:Bounds x="173" y="102" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0z26bx8_di" bpmnElement="SequenceFlow_0z26bx8">
<di:waypoint x="209" y="120" />
<di:waypoint x="291" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0j7j5vr_di" bpmnElement="SequenceFlow_0j7j5vr">
<di:waypoint x="391" y="120" />
<di:waypoint x="509" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_04am1uf_di" bpmnElement="SequenceFlow_04am1uf">
<di:waypoint x="609" y="120" />
<di:waypoint x="733" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_09f8xq6_di" bpmnElement="EndEvent_13zxbrp">
<dc:Bounds x="733" y="102" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_1luszkb_di" bpmnElement="BoundaryEvent_1twn145">
<dc:Bounds x="560" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1v8uiu7_di" bpmnElement="SequenceFlow_1v8uiu7">
<di:waypoint x="578" y="160" />
<di:waypoint x="578" y="240" />
<di:waypoint x="649" y="240" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_0e70jxe_di" bpmnElement="IntermediateThrowEvent_1qs7w8u">
<dc:Bounds x="649" y="222" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1v3brq5_di" bpmnElement="SequenceFlow_1v3brq5">
<di:waypoint x="685" y="240" />
<di:waypoint x="735" y="240" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1nhlxz3_di" bpmnElement="EndEvent_0tw6fo0">
<dc:Bounds x="735" y="222" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_1vdok1c_di" bpmnElement="BoundaryEvent_05nns77">
<dc:Bounds x="323" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ServiceTask_1ug161x_di" bpmnElement="Task_1tzxzz2">
<dc:Bounds x="509" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ServiceTask_0n4z9ts_di" bpmnElement="Task_147od7p">
<dc:Bounds x="291" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_0fhoe83_di" bpmnElement="Association_0fhoe83">
<di:waypoint x="341" y="178" />
<di:waypoint x="341" y="240" />
<di:waypoint x="363" y="240" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ServiceTask_0pkhcy3_di" bpmnElement="Task_07yeeeh">
<dc:Bounds x="363" y="200" width="100" height="80" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
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

RIA kasutajatugi asutustele projektide ja gruppide loomiseks: help@ria.ee