Skip to content

GitLab

Commit 1060eddd authored by Jürgen Hannus's avatar Jürgen Hannus
Browse files

Merge branch 'database-camunda-remove' into 'develop' 

Database camunda remove

See merge request teis/officials-service!46
parents 67263eb9 ceceee15
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 180 deletions
build.gradle
View file @ 1060eddd
......@@ -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 @ 1060eddd
theGroup=ee.sm.ti.teis
theVersion=1.8.0
commonsVersion=1.10.0
theVersion=1.9.0-SNAPSHOT
commonsVersion=1.14.0-SNAPSHOT
officeApiGatewayVersion=1.8.0
pluginVersion=1.1.1
mapstructVersion=1.3.0.Final
querydslVersion=4.1.3
pluginVersion=1.2.0-SNAPSHOT
gradle/wrapper/gradle-wrapper.properties
View file @ 1060eddd
......@@ -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 @ 1060eddd
......@@ -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 @ 1060eddd
......@@ -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,7 +15,6 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@SpringBootTest(classes = OfficialsServiceApp.class)
@ActiveProfiles("integtest")
@Testcontainers
@DirtiesContext
@ContextConfiguration(initializers = {OfficialsAppTestBase.Initializer.class})
public abstract class OfficialsAppTestBase {
......
service/src/integTest/resources/application-integtest.yaml
View file @ 1060eddd
......@@ -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 @ 1060eddd
......@@ -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 @ 1060eddd
......@@ -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/resources/META-INF/processes.xml deleted 100644 → 0
View file @ 67263eb9
<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 @ 1060eddd
......@@ -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 @ 1060eddd
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}
......
service/src/main/resources/db/changelog/db.changelog-master.xml
View file @ 1060eddd
......@@ -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 @ 67263eb9
<?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>
Markdown is supported
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