diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java index 58ee9e4763..755f5a13f4 100644 --- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java +++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java @@ -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; @@ -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); } diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java index eb0beeb4df..79bc263bda 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java @@ -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; @@ -18,8 +18,6 @@ import org.springframework.orm.jpa.vendor.Database; import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter; -import liquibase.integration.spring.SpringLiquibase; - @Configuration public class DatabaseConfiguration { @@ -27,7 +25,6 @@ public class DatabaseConfiguration { 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) { @@ -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); @@ -80,7 +75,6 @@ public EclipseLinkJpaVendorAdapter eclipseLinkJpaVendorAdapter() { return eclipseLinkJpaVendorAdapter; } - @Inject @Bean public SpringLiquibase liquibaseChangelog(DataSource dataSource) { return getLiquibaseTemplate(dataSource, LIQUIBASE_CHANGELOG); diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java index 8675b7eab3..b2cb51a087 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java @@ -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; @@ -42,7 +41,6 @@ public class FlowableConfiguration { protected Supplier randomIdGenerator = () -> UUID.randomUUID() .toString(); - @Inject @Bean @DependsOn("liquibaseChangelog") public ProcessEngine processEngine(ApplicationContext applicationContext, SpringProcessEngineConfiguration processEngineConfiguration) @@ -53,7 +51,6 @@ public ProcessEngine processEngine(ApplicationContext applicationContext, Spring return processEngineFactoryBean.getObject(); } - @Inject @Bean @DependsOn("liquibaseChangelog") public SpringProcessEngineConfiguration processEngineConfiguration(DataSource dataSource, PlatformTransactionManager transactionManager, @@ -79,7 +76,6 @@ public SpringProcessEngineConfiguration processEngineConfiguration(DataSource da return processEngineConfiguration; } - @Inject @Bean public AsyncExecutor jobExecutor(DefaultAsyncTaskExecutor asyncTaskExecutor, String jobExecutorId) { DefaultAsyncJobExecutor jobExecutor = new DefaultAsyncJobExecutor() { @@ -103,7 +99,6 @@ protected void initAsyncJobExecutionThreadPool() { return jobExecutor; } - @Inject @Bean public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configuration) { DefaultAsyncTaskExecutor taskExecutor = new DefaultAsyncTaskExecutor(); @@ -114,7 +109,6 @@ public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configurat return taskExecutor; } - @Inject @Bean public String jobExecutorId(ApplicationConfiguration applicationConfiguration) { String applicationGuid = applicationConfiguration.getApplicationGuid(); @@ -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(); diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/JmxConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/JmxConfiguration.java index a32b95e8cb..cb52bb629a 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/JmxConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/JmxConfiguration.java @@ -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; @@ -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(); diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/MicrometerConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/MicrometerConfiguration.java index c0fd8d1d87..079b5de03c 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/MicrometerConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/MicrometerConfiguration.java @@ -3,8 +3,11 @@ 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; @@ -12,12 +15,6 @@ 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 { @@ -25,7 +22,6 @@ public class MicrometerConfiguration { 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) { diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/UAAClientConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/UAAClientConfiguration.java index be8b6a24ce..7200e4f72f 100644 --- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/UAAClientConfiguration.java +++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/UAAClientConfiguration.java @@ -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; @@ -17,7 +16,6 @@ @Configuration public class UAAClientConfiguration { - @Inject @Bean public UAAClient uaaClient(ApplicationConfiguration configuration) { if (configuration.shouldSkipSslValidation()) { diff --git a/pom.xml b/pom.xml index ceaf6da57e..78f17b5bef 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 5.3.6 4.0.8 7.2.0 - 6.2.14 + 6.2.15 6.5.7 7.0.2 2.20