Skip to content

Increase spring version and add lazy bean creation for flowableFacade #1754

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.

Sign up for GitHub

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

Open
s-yonkov-yonkov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Increase spring version and add lazy bean creation for flowableFacade #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc7788
Increase spring version and add lazy bean creation for flowableFacade
s-yonkov-yonkov Dec 15, 2025
bacbb1e
remove @Inject
s-yonkov-yonkov Dec 16, 2025
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
11 changes: 0 additions & 11 deletions ...e/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import javax.sql.DataSource;

import jakarta.inject.Inject;
import org.cloudfoundry.multiapps.controller.core.auditlogging.impl.AuditLoggingFacadeSLImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -11,61 +10,51 @@
public class AuditLogBean {

@Bean
@Inject
public AuditLoggingFacade buildAuditLoggingFacade(DataSource dataSource, UserInfoProvider userInfoProvider) {
return new AuditLoggingFacadeSLImpl(dataSource, userInfoProvider);
}

@Bean
@Inject
public CsrfTokenApiServiceAuditLog buildCsrfTokenApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new CsrfTokenApiServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public FilesApiServiceAuditLog buildFilesApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new FilesApiServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public LoginAttemptAuditLog buildLoginAttemptAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new LoginAttemptAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public InfoApiServiceAuditLog buildInfoApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new InfoApiServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public MtasApiServiceAuditLog buildMtasApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new MtasApiServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public OperationsApiServiceAuditLog buildOperationsApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new OperationsApiServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public MtaConfigurationPurgerAuditLog buildMtaConfigurationPurgerAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new MtaConfigurationPurgerAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public ConfigurationSubscriptionServiceAuditLog buildAConfigurationSubscriptionServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new ConfigurationSubscriptionServiceAuditLog(auditLoggingFacade);
}

@Bean
@Inject
public ConfigurationEntryServiceAuditLog buildAConfigurationEntryServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
return new ConfigurationEntryServiceAuditLog(auditLoggingFacade);
}
Expand Down
8 changes: 1 addition & 7 deletions ...n/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.cloudfoundry.multiapps.controller.web.configuration;

import jakarta.inject.Inject;
import javax.sql.DataSource;

import liquibase.integration.spring.SpringLiquibase;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.cloudfoundry.multiapps.controller.persistence.DataSourceWithDialect;
import org.cloudfoundry.multiapps.controller.persistence.dialects.DataSourceDialect;
Expand All @@ -18,16 +18,13 @@
import org.springframework.orm.jpa.vendor.Database;
import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;

import liquibase.integration.spring.SpringLiquibase;

@Configuration
public class DatabaseConfiguration {

private static final String DATA_SOURCE_SERVICE_NAME = "deploy-service-database";
private static final String LIQUIBASE_CHANGELOG = "classpath:/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog.xml";
private static final String ENTITY_MANAGER_DEFAULT_PERSISTENCE_UNIT_NAME = "Default";

@Inject
@Bean
public CloudDataSourceFactoryBean dataSource(DataSourceFactory dataSourceFactory, EnvironmentServicesFinder vcapServiceFinder,
ApplicationConfiguration configuration) {
Expand All @@ -39,13 +36,11 @@ public DefaultDataSourceDialect dataSourceDialect() {
return new DefaultDataSourceDialect();
}

@Inject
@Bean
public DataSourceWithDialect dataSourceWithDialect(DataSource dataSource, DataSourceDialect dataSourceDialect) {
return new DataSourceWithDialect(dataSource, dataSourceDialect);
}

@Inject
@Bean
public DataSourceTransactionManager transactionManager(DataSource dataSource, ApplicationConfiguration applicationConfiguration) {
DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager(dataSource);
Expand Down Expand Up @@ -80,7 +75,6 @@ public EclipseLinkJpaVendorAdapter eclipseLinkJpaVendorAdapter() {
return eclipseLinkJpaVendorAdapter;
}

@Inject
@Bean
public SpringLiquibase liquibaseChangelog(DataSource dataSource) {
return getLiquibaseTemplate(dataSource, LIQUIBASE_CHANGELOG);
Expand Down
8 changes: 0 additions & 8 deletions ...n/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.util.function.Supplier;
import javax.sql.DataSource;

import jakarta.inject.Inject;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.flowable.common.engine.impl.AbstractEngineConfiguration;
import org.flowable.common.engine.impl.async.DefaultAsyncTaskExecutor;
Expand Down Expand Up @@ -42,7 +41,6 @@ public class FlowableConfiguration {
protected Supplier<String> randomIdGenerator = () -> UUID.randomUUID()
.toString();

@Inject
@Bean
@DependsOn("liquibaseChangelog")
public ProcessEngine processEngine(ApplicationContext applicationContext, SpringProcessEngineConfiguration processEngineConfiguration)
Expand All @@ -53,7 +51,6 @@ public ProcessEngine processEngine(ApplicationContext applicationContext, Spring
return processEngineFactoryBean.getObject();
}

@Inject
@Bean
@DependsOn("liquibaseChangelog")
public SpringProcessEngineConfiguration processEngineConfiguration(DataSource dataSource, PlatformTransactionManager transactionManager,
Expand All @@ -79,7 +76,6 @@ public SpringProcessEngineConfiguration processEngineConfiguration(DataSource da
return processEngineConfiguration;
}

@Inject
@Bean
public AsyncExecutor jobExecutor(DefaultAsyncTaskExecutor asyncTaskExecutor, String jobExecutorId) {
DefaultAsyncJobExecutor jobExecutor = new DefaultAsyncJobExecutor() {
Expand All @@ -103,7 +99,6 @@ protected void initAsyncJobExecutionThreadPool() {
return jobExecutor;
}

@Inject
@Bean
public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configuration) {
DefaultAsyncTaskExecutor taskExecutor = new DefaultAsyncTaskExecutor();
Expand All @@ -114,7 +109,6 @@ public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configurat
return taskExecutor;
}

@Inject
@Bean
public String jobExecutorId(ApplicationConfiguration applicationConfiguration) {
String applicationGuid = applicationConfiguration.getApplicationGuid();
Expand All @@ -129,13 +123,11 @@ private String buildJobExecutorId(String applicationId, int applicationInstanceI
return String.format(JOB_EXECUTOR_ID_TEMPLATE, applicationId, applicationInstanceIndex, randomIdGenerator.get());
}

@Inject
@Bean
public RuntimeService runtimeService(ProcessEngine processEngine) {
return processEngine.getRuntimeService();
}

@Inject
@Bean
public HistoryService historyService(ProcessEngine processEngine) {
return processEngine.getHistoryService();
Expand Down
3 changes: 0 additions & 3 deletions ...c/main/java/org/cloudfoundry/multiapps/controller/web/configuration/JmxConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.util.Map;

import jakarta.inject.Inject;

import org.cloudfoundry.multiapps.controller.web.monitoring.Metrics;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -14,7 +12,6 @@ public class JmxConfiguration {

private static final String METRICS_BEAN = "org.cloudfoundry.multiapps.controller.web.monitoring:type=Metrics,name=MetricsMBean";

@Inject
@Bean
public MBeanExporter jmxExporter(Metrics metrics) {
MBeanExporter mBeanExporter = new MBeanExporter();
Expand Down
14 changes: 5 additions & 9 deletions ...java/org/cloudfoundry/multiapps/controller/web/configuration/MicrometerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,25 @@
import java.text.MessageFormat;
import java.time.Duration;

import jakarta.inject.Inject;

import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.jmx.JmxConfig;
import io.micrometer.jmx.JmxMeterRegistry;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.jmx.JmxConfig;
import io.micrometer.jmx.JmxMeterRegistry;

@Configuration
public class MicrometerConfiguration {

private static final Logger LOGGER = LoggerFactory.getLogger(MicrometerConfiguration.class);
public static final String DYNATRACE_SERVICE_NAME = "deploy-service-dynatrace";
private static final String CLIENT_CONNECTIONS_METRICS_PREFIX = "reactor.netty.connection.provider.cloudfoundry-client.";

@Inject
@Bean
public JmxMeterRegistry jmxMeterRegistry(ApplicationConfiguration configuration, EnvironmentServicesFinder vcapServiceFinder) {
if (vcapServiceFinder.findJdbcService(DYNATRACE_SERVICE_NAME) == null) {
Expand Down
2 changes: 0 additions & 2 deletions .../java/org/cloudfoundry/multiapps/controller/web/configuration/UAAClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.text.MessageFormat;
import java.util.Map;

import jakarta.inject.Inject;
import org.cloudfoundry.multiapps.common.util.JsonUtil;
import org.cloudfoundry.multiapps.controller.client.facade.util.RestUtil;
import org.cloudfoundry.multiapps.controller.client.uaa.UAAClient;
Expand All @@ -17,7 +16,6 @@
@Configuration
public class UAAClientConfiguration {

@Inject
@Bean
public UAAClient uaaClient(ApplicationConfiguration configuration) {
if (configuration.shouldSkipSslValidation()) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<httpcore.version>5.3.6</httpcore.version>
<eclipselink.version>4.0.8</eclipselink.version>
<flowable.version>7.2.0</flowable.version>
<spring.version>6.2.14</spring.version>
<spring.version>6.2.15</spring.version>
<spring-security.version>6.5.7</spring-security.version>
<hikari.version>7.0.2</hikari.version>
<jackson-annotations.version>2.20</jackson-annotations.version>
Expand Down
Loading