Skip to content

Commit

Permalink
chore(merge): release-10.2.0 into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
bonita-ci committed Sep 12, 2024
2 parents 47ba74a + e72a118 commit 3aaf7a1
Show file tree
Hide file tree
Showing 12 changed files with 908 additions and 874 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ publishing {
}
}

databaseIntegrationTest { include "**/BDRepositoryLocalIT.class" }
databaseIntegrationTest { include "**/TemporaryContentAPILocalIT.class" }
databaseIntegrationTest {
include "**/*IT.class"
}

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void custom_application_should_be_deployed_entirely() throws Exception {
.isThrownBy(() -> getApplicationAPI().getIApplicationByToken("appsManagerBonita"));

// given:
ApplicationInstaller applicationInstallerImpl = ServiceAccessorSingleton.getInstance()
ApplicationInstaller applicationInstaller = ServiceAccessorSingleton.getInstance()
.lookup(ApplicationInstaller.class);
final ApplicationArchiveReader applicationArchiveReader = new ApplicationArchiveReader(
new ArtifactTypeDetector(new BdmDetector(),
Expand All @@ -76,7 +76,7 @@ public void custom_application_should_be_deployed_entirely() throws Exception {
// when:
try (var applicationAsStream = ApplicationInstallerIT.class.getResourceAsStream("/customer-application.zip")) {
var applicationArchive = applicationArchiveReader.read(applicationAsStream);
applicationInstallerImpl.install(applicationArchive);
applicationInstaller.install(applicationArchive);
}

// then:
Expand Down Expand Up @@ -107,7 +107,7 @@ public void custom_application_should_be_deployed_entirely() throws Exception {
@Test
public void custom_application_should_be_installed_with_configuration() throws Exception {
// given:
ApplicationInstaller applicationInstallerImpl = ServiceAccessorSingleton.getInstance()
ApplicationInstaller applicationInstaller = ServiceAccessorSingleton.getInstance()
.lookup(ApplicationInstaller.class);
final ApplicationArchiveReader applicationArchiveReader = new ApplicationArchiveReader(
new ArtifactTypeDetector(new BdmDetector(),
Expand All @@ -121,7 +121,7 @@ public void custom_application_should_be_installed_with_configuration() throws E
var applicationArchive = applicationArchiveReader.read(applicationAsStream);
applicationArchive.setConfigurationFile(new File(ApplicationInstallerIT.class
.getResource("/simple-app-1.0.0-SNAPSHOT-local.bconf").getFile()));
applicationInstallerImpl.install(applicationArchive);
applicationInstaller.install(applicationArchive);
}

final long processDefinitionId = getProcessAPI().getProcessDefinitionId("Pool", "1.0");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void before() throws Exception {
loginOnDefaultTenantWithDefaultTechnicalUser();

applicationInstaller = ServiceAccessorSingleton.getInstance()
.lookup(ApplicationInstaller.class);;
.lookup(ApplicationInstaller.class);
applicationArchiveReader = new ApplicationArchiveReader(
new ArtifactTypeDetector(new BdmDetector(),
new LivingApplicationDetector(), new OrganizationDetector(), new CustomPageDetector(),
Expand All @@ -90,10 +90,10 @@ private void initFirstInstall() throws Exception {
.isThrownBy(() -> getApplicationAPI().getIApplicationByToken("appsManagerBonita"));

// given:
final InputStream applicationAsStream = this.getClass().getResourceAsStream("/customer-application.zip");

// when:
applicationInstaller.install(applicationArchiveReader.read(applicationAsStream));
try (final InputStream applicationAsStream = this.getClass().getResourceAsStream("/customer-application.zip")) {
// when:
applicationInstaller.install(applicationArchiveReader.read(applicationAsStream));
}

// then:

Expand Down
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class CustomOrDefaultApplicationInstaller {
@Getter
protected String applicationInstallFolder;

protected final ApplicationInstaller applicationInstaller;
protected final ApplicationInstallerImpl applicationInstaller;

private final DefaultLivingApplicationImporter defaultLivingApplicationImporter;
private final MandatoryLivingApplicationImporter mandatoryLivingApplicationImporter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class ApplicationInstallerTest {

@InjectMocks
@Spy
private ApplicationInstaller applicationInstaller;
private ApplicationInstallerImpl applicationInstaller;

@BeforeEach
void before() throws Exception {
Expand Down Expand Up @@ -412,7 +412,8 @@ void install_should_call_install_configuration_file_on_installation_service() th

// when:
applicationInstaller.installConfiguration(
new File(ApplicationInstaller.class.getResource("/RequestLoan_conf_with_null_params.bconf").getFile()),
new File(ApplicationInstallerImpl.class.getResource("/RequestLoan_conf_with_null_params.bconf")
.getFile()),
executionResult);

// then:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class ApplicationInstallerUpdateTest {

@InjectMocks
@Spy
private ApplicationInstaller applicationInstaller;
private ApplicationInstallerImpl applicationInstaller;

@Before
public void before() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static class TextConfiguration {

@Bean
public CustomOrDefaultApplicationInstaller installer() {
return new CustomOrDefaultApplicationInstaller(mock(ApplicationInstaller.class),
return new CustomOrDefaultApplicationInstaller(mock(ApplicationInstallerImpl.class),
mock(DefaultLivingApplicationImporter.class), mock(MandatoryLivingApplicationImporter.class),
mock(TenantServicesManager.class), mock(ApplicationArchiveReader.class),
mock(PlatformService.class));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class CustomOrDefaultApplicationInstallerTest {
ArgumentCaptor<Callable<Object>> callableCaptor;

@Mock
private ApplicationInstaller applicationInstaller;
private ApplicationInstallerImpl applicationInstaller;
@Mock
DefaultLivingApplicationImporter defaultLivingApplicationImporter;
@Mock
Expand Down

0 comments on commit 3aaf7a1

Please sign in to comment.