Skip to content

Commit f45e6e1

Browse files
committed
Adjust deprecated API usage
* Replace JUnit Jupiter getOrComputeIfAbsent with computeIfAbsent * Use java.math.RoundingMode in BigDecimal#divide * Use non-deprecated RabbitMQContainer * Use BCryptPasswordEncoder instead of StandardPasswordEncoder in test * Remove not needed MockitoAnnotation#initMocks * Use TransactionTemplate#executeWithoutResult instead of deprecated TransactionCallbackWithoutResult
1 parent 63ba77d commit f45e6e1

File tree

24 files changed

+33
-40
lines changed

24 files changed

+33
-40
lines changed

modules/flowable-app-engine/src/main/java/org/flowable/app/engine/test/FlowableAppExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected String getConfigurationResource(ExtensionContext context) {
141141

142142
protected FlowableAppTestHelper getTestHelper(ExtensionContext context) {
143143
return getStore(context)
144-
.getOrComputeIfAbsent(context.getRequiredTestClass(), key -> new FlowableAppTestHelper(createAppEngine(context)), FlowableAppTestHelper.class);
144+
.computeIfAbsent(context.getRequiredTestClass(), key -> new FlowableAppTestHelper(createAppEngine(context)), FlowableAppTestHelper.class);
145145
}
146146

147147
protected AppEngine createAppEngine(ExtensionContext context) {

modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityHelperUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.junit.jupiter.api.extension.ExtensionContext;
3535
import org.junit.jupiter.params.provider.Arguments;
3636
import org.junit.jupiter.params.provider.ArgumentsProvider;
37+
import org.junit.jupiter.params.support.ParameterDeclarations;
3738
import org.w3c.dom.Document;
3839
import org.w3c.dom.Node;
3940
import org.w3c.dom.NodeList;
@@ -46,7 +47,7 @@ public class EntityHelperUtil {
4647
static class EntityPackageTestArgumentsProvider implements ArgumentsProvider {
4748

4849
@Override
49-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
50+
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context){
5051
return Stream.of(
5152

5253
Arguments.of(new EntityMappingPackageInformation("org.flowable",

modules/flowable-bpmn-converter/src/test/java/org/flowable/editor/language/xml/util/ConvertBpmnModelResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
4242
public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
4343
ExtensionContext.Store store = extensionContext.getRoot().getStore(NAMESPACE);
4444

45-
return store.getOrComputeIfAbsent(extensionContext.getUniqueId(), key -> modelSupplier.get(), BpmnModel.class);
45+
return store.computeIfAbsent(extensionContext.getUniqueId(), key -> modelSupplier.get(), BpmnModel.class);
4646
}
4747

4848
}

modules/flowable-cmmn-converter/src/test/java/org/flowable/test/cmmn/converter/util/ConvertCmmnModelResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
4242
public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
4343
ExtensionContext.Store store = extensionContext.getRoot().getStore(NAMESPACE);
4444

45-
return store.getOrComputeIfAbsent(extensionContext.getUniqueId(), key -> modelSupplier.get(), CmmnModel.class);
45+
return store.computeIfAbsent(extensionContext.getUniqueId(), key -> modelSupplier.get(), CmmnModel.class);
4646
}
4747

4848
}

modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/CmmnEngineConfiguratorExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
117117

118118
protected ProcessEngine getProcessEngine(ExtensionContext context) {
119119
String configurationResource = getConfigurationResource(context);
120-
return getStore(context).getOrComputeIfAbsent(configurationResource, this::initializeProcessEngine, CloseableEngine.class).processEngine;
120+
return getStore(context).computeIfAbsent(configurationResource, this::initializeProcessEngine, CloseableEngine.class).processEngine;
121121
}
122122

123123
protected String getConfigurationResource(ExtensionContext context) {

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/test/PluggableFlowableCmmnExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class PluggableFlowableCmmnExtension extends InternalFlowableCmmnExtensio
3131
@Override
3232
protected CmmnEngine getCmmnEngine(ExtensionContext context) {
3333
String configurationResource = getConfigurationResource(context);
34-
return getStore(context).getOrComputeIfAbsent(configurationResource, this::initializeCmmnEngine, CmmnEngine.class);
34+
return getStore(context).computeIfAbsent(configurationResource, this::initializeCmmnEngine, CmmnEngine.class);
3535
}
3636

3737
protected CmmnEngine initializeCmmnEngine(String configurationResource) {

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/test/FlowableCmmnExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ protected String getConfigurationResource(ExtensionContext context) {
166166

167167
protected FlowableCmmnTestHelper getTestHelper(ExtensionContext context) {
168168
return getStore(context)
169-
.getOrComputeIfAbsent(context.getRequiredTestClass(),
169+
.computeIfAbsent(context.getRequiredTestClass(),
170170
key -> new FlowableCmmnTestHelper(createCmmnEngine(context)), FlowableCmmnTestHelper.class);
171171
}
172172

modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/impl/test/InternalFlowableCmmnSpringExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class InternalFlowableCmmnSpringExtension extends InternalFlowableCmmnExt
2727
@Override
2828
protected CmmnEngine getCmmnEngine(ExtensionContext context) {
2929
return getStore(context)
30-
.getOrComputeIfAbsent(context.getRequiredTestClass(), key -> SpringExtension.getApplicationContext(context).getBean(CmmnEngine.class),
30+
.computeIfAbsent(context.getRequiredTestClass(), key -> SpringExtension.getApplicationContext(context).getBean(CmmnEngine.class),
3131
CmmnEngine.class);
3232
}
3333

modules/flowable-cxf/src/test/java/org/flowable/engine/impl/webservice/MockWebServiceExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
6262
}
6363

6464
private static MockWebServiceContext getMockWebServiceContext(ExtensionContext context) {
65-
return getStore(context).getOrComputeIfAbsent(context.getUniqueId(), key -> create(), MockWebServiceContext.class);
65+
return getStore(context).computeIfAbsent(context.getUniqueId(), key -> create(), MockWebServiceContext.class);
6666

6767
}
6868

modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/test/PluggableFlowableDmnExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class PluggableFlowableDmnExtension extends InternalFlowableDmnExtension
3131
@Override
3232
protected DmnEngine getDmnEngine(ExtensionContext context) {
3333
String configurationResource = getConfigurationResource(context);
34-
return getStore(context).getOrComputeIfAbsent(configurationResource, this::initializeDmnEngine, CloseableEngine.class).dmnEngine;
34+
return getStore(context).computeIfAbsent(configurationResource, this::initializeDmnEngine, CloseableEngine.class).dmnEngine;
3535
}
3636

3737
protected CloseableEngine initializeDmnEngine(String configurationResource) {

0 commit comments

Comments
 (0)