Skip to content

Commit 5c2d653

Browse files
author
Yavor16
committed
fix comments
1 parent 07c92b8 commit 5c2d653

File tree

2 files changed

+14
-5
lines changed
  • multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging
  • multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/bootstrap

2 files changed

+14
-5
lines changed

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package org.cloudfoundry.multiapps.controller.core.auditlogging;
22

3+
import org.cloudfoundry.multiapps.controller.core.auditlogging.impl.AuditLoggingFacadeSLImpl;
34
import org.springframework.context.annotation.Bean;
45
import org.springframework.context.annotation.Configuration;
56

67
import javax.inject.Inject;
8+
import javax.sql.DataSource;
79

810
@Configuration
911
public class AuditLogBean {
1012

11-
// @Bean
12-
// public AuditLoggingFacade buildAuditLoggingFacade() throws NamingException {
13-
// AuditLogMessageFactory auditLogMessageFactory = (AuditLogMessageFactory) new InitialContext().lookup("java:comp/env/audit");
14-
// return new AuditLoggingFacadeXSAImpl(auditLogMessageFactory);
15-
// }
13+
@Bean
14+
public AuditLoggingFacade buildAuditLoggingFacade(DataSource dataSource, UserInfoProvider userInfoProvider) {
15+
return new AuditLoggingFacadeSLImpl(dataSource, userInfoProvider);
16+
}
1617

1718
@Bean
1819
@Inject

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/bootstrap/BootstrapServlet.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@
1212
import javax.servlet.http.HttpServlet;
1313
import javax.sql.DataSource;
1414

15+
import org.cloudfoundry.multiapps.controller.core.auditlogging.UserInfoProvider;
1516
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
1617
import org.cloudfoundry.multiapps.controller.persistence.services.FileService;
1718
import org.cloudfoundry.multiapps.controller.persistence.services.LockOwnerService;
1819
import org.cloudfoundry.multiapps.controller.process.util.LockOwnerReleaser;
1920
import org.cloudfoundry.multiapps.controller.web.Messages;
21+
import org.cloudfoundry.multiapps.controller.web.util.SecurityContextUtil;
2022
import org.flowable.engine.ProcessEngine;
2123
import org.slf4j.Logger;
2224
import org.slf4j.LoggerFactory;
2325
import org.springframework.beans.factory.annotation.Qualifier;
26+
import org.springframework.context.annotation.Bean;
2427
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
2528

2629
public class BootstrapServlet extends HttpServlet {
@@ -114,4 +117,9 @@ private void clearLockOwner() {
114117
protected void destroyExtras() {
115118
// Do nothing
116119
}
120+
121+
@Bean
122+
public UserInfoProvider buildUserInfoProvider() {
123+
return SecurityContextUtil::getUserInfo;
124+
}
117125
}

0 commit comments

Comments
 (0)