Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAM-13629: enable quarkus application.properties for the process engine config #1582

Merged
merged 3 commits into from
Aug 19, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
SQUASH ME: add additional test cases
  • Loading branch information
koevskinikola committed Aug 19, 2021
commit 7516fd5e3f670ce0251a636b1cf2f306d4f93a37
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public class ManagedJobExecutorTest {
@RegisterExtension
static final QuarkusUnitTest unitTest = new ProcessEngineAwareExtension()
.engineConfig(QuarkusProcessEngineConfiguration::new) // Use default config with Job Executor enabled
.withConfigurationResource("job-executor-application.properties")
.withConfigurationResource("org/camunda/bpm/quarkus/engine/test/config/" +
"job-executor-application.properties")
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
* under one or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information regarding copyright
* ownership. Camunda licenses this file to you under the Apache License,
* Version 2.0; you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.camunda.bpm.quarkus.engine.test.config;

import static org.assertj.core.api.Assertions.assertThat;

import javax.inject.Inject;
import java.sql.SQLException;

import io.quarkus.test.QuarkusUnitTest;
import org.camunda.bpm.engine.ProcessEngine;
import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.camunda.bpm.engine.impl.jobexecutor.JobExecutor;
import org.camunda.bpm.quarkus.engine.extension.CamundaEngineConfig;
import org.camunda.bpm.quarkus.engine.test.helper.ProcessEngineAwareExtension;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

public class CamundaEngineConfigFileTest {

@RegisterExtension
static final QuarkusUnitTest unitTest = new ProcessEngineAwareExtension()
.withConfigurationResource("org/camunda/bpm/quarkus/engine/test/config/mixed-application.properties")
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Inject
CamundaEngineConfig config;

@Inject
ProcessEngine processEngine;

@Test
public void shouldLoadAllConfigProperties() throws SQLException {
// given
// a .properties file with process engine and job executor configuration

// when
ProcessEngineConfigurationImpl configuration
= (ProcessEngineConfigurationImpl) processEngine.getProcessEngineConfiguration();
JobExecutor jobExecutor = configuration.getJobExecutor();

// then
// assert engine config properties
assertThat(configuration.isCmmnEnabled()).isFalse();
assertThat(configuration.isDmnEnabled()).isFalse();
assertThat(configuration.getHistory()).isEqualTo("none");
assertThat(configuration.isInitializeTelemetry()).isFalse();
// assert job executor properties
assertThat(jobExecutor.getMaxJobsPerAcquisition()).isEqualTo(5);
assertThat(jobExecutor.getLockTimeInMillis()).isEqualTo(500000);
assertThat(jobExecutor.getWaitTimeInMillis()).isEqualTo(7000);
assertThat(jobExecutor.getMaxWait()).isEqualTo(65000);
assertThat(jobExecutor.getBackoffTimeInMillis()).isEqualTo(5);
// assert correct thread pool config
assertThat(config.jobExecutor.threadPool.maxPoolSize).isEqualTo(12);
assertThat(config.jobExecutor.threadPool.queueSize).isEqualTo(5);
// assert correct datasource
assertThat(config.datasource.get()).isEqualTo("camunda");
assertThat(configuration.getDataSource().getConnection()).asString().contains("h2:mem:camunda");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public class CamundaEngineConfigurationConfigTest {

@RegisterExtension
static final QuarkusUnitTest unitTest = new ProcessEngineAwareExtension()
.withConfigurationResource("process-engine-config-application.properties")
.withConfigurationResource("org/camunda/bpm/quarkus/engine/test/config/" +
"process-engine-config-application.properties")
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class CamundaEngineJobExecutorConfigTest {

@RegisterExtension
static final QuarkusUnitTest unitTest = new ProcessEngineAwareExtension()
.withConfigurationResource("job-executor-application.properties")
.withConfigurationResource("org/camunda/bpm/quarkus/engine/test/config/" +
"job-executor-application.properties")
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
* under one or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information regarding copyright
* ownership. Camunda licenses this file to you under the Apache License,
* Version 2.0; you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.camunda.bpm.quarkus.engine.test.config;

import static org.assertj.core.api.Assertions.assertThat;

import javax.inject.Inject;
import java.sql.SQLException;

import io.quarkus.test.QuarkusUnitTest;
import org.camunda.bpm.engine.ProcessEngine;
import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.camunda.bpm.engine.impl.jobexecutor.JobExecutor;
import org.camunda.bpm.quarkus.engine.extension.CamundaEngineConfig;
import org.camunda.bpm.quarkus.engine.extension.QuarkusProcessEngineConfiguration;
import org.camunda.bpm.quarkus.engine.test.helper.ProcessEngineAwareExtension;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

public class CamundaEngineProgrammaticAndConfigFileTest {

@RegisterExtension
static final QuarkusUnitTest unitTest = new ProcessEngineAwareExtension()
.engineConfig(() -> {
QuarkusProcessEngineConfiguration engineConfig = new QuarkusProcessEngineConfiguration();
engineConfig.setProcessEngineName("customEngine");
engineConfig.setJobExecutorActivate(false);
engineConfig.setHistory("full");

return engineConfig;
})
.withConfigurationResource("org/camunda/bpm/quarkus/engine/test/config/mixed-application.properties")
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Inject
CamundaEngineConfig config;

@Inject
ProcessEngine processEngine;

@Test
public void shouldUseProvidedConfigurationAndConfigProperties() throws SQLException {
// given
// a .properties file with process engine and job executor configuration

// when
ProcessEngineConfigurationImpl configuration
= (ProcessEngineConfigurationImpl) processEngine.getProcessEngineConfiguration();
JobExecutor jobExecutor = configuration.getJobExecutor();

// then
// assert provided configuration
assertThat(configuration.getProcessEngineName()).isEqualTo("customEngine");
assertThat(configuration.isJobExecutorActivate()).isFalse();
// assert engine config properties
assertThat(configuration.isCmmnEnabled()).isFalse();
assertThat(configuration.isDmnEnabled()).isFalse();
assertThat(configuration.getHistory()).isEqualTo("none");
assertThat(configuration.isInitializeTelemetry()).isFalse();
// assert job executor properties
assertThat(jobExecutor.getMaxJobsPerAcquisition()).isEqualTo(5);
assertThat(jobExecutor.getLockTimeInMillis()).isEqualTo(500000);
assertThat(jobExecutor.getWaitTimeInMillis()).isEqualTo(7000);
assertThat(jobExecutor.getMaxWait()).isEqualTo(65000);
assertThat(jobExecutor.getBackoffTimeInMillis()).isEqualTo(5);
// assert correct thread pool config
assertThat(config.jobExecutor.threadPool.maxPoolSize).isEqualTo(12);
assertThat(config.jobExecutor.threadPool.queueSize).isEqualTo(5);
// assert correct datasource
assertThat(config.datasource.get()).isEqualTo("camunda");
assertThat(configuration.getDataSource().getConnection()).asString().contains("h2:mem:camunda");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public QuarkusUnitTest setArchiveProducer(Supplier<JavaArchive> archiveProducer)
}

@Override
public QuarkusUnitTest withConfigurationResource(String resourceName) {
public ProcessEngineAwareExtension withConfigurationResource(String resourceName) {
this.withConfigurationResource = resourceName;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
quarkus.camunda.cmmn-enabled=false
quarkus.camunda.dmn-enabled=false
quarkus.camunda.history=none
quarkus.camunda.initialize-telemetry=false

quarkus.camunda.job-executor.thread-pool.max-pool-size=12
quarkus.camunda.job-executor.thread-pool.queue-size=5

quarkus.camunda.job-executor.max-jobs-per-acquisition=5
quarkus.camunda.job-executor.lock-time-in-millis=500000
quarkus.camunda.job-executor.wait-time-in-millis=7000
quarkus.camunda.job-executor.max-wait=65000
quarkus.camunda.job-executor.backoff-time-in-millis=5

quarkus.datasource.camunda.db-kind=h2
quarkus.datasource.camunda.username=camunda
quarkus.datasource.camunda.password=camunda
quarkus.datasource.camunda.jdbc.url=jdbc:h2:mem:camunda;MVCC=TRUE;TRACE_LEVEL_FILE=0;DB_CLOSE_ON_EXIT=FALSE
quarkus.camunda.datasource=camunda