This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 25a0dea [DLAB-1897] Fixed issue with scheduler
25a0dea is described below
commit 25a0deafe3a4a7a0a8647da72eba12581ed298d5
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Tue Jun 30 11:52:42 2020 +0300
[DLAB-1897] Fixed issue with scheduler
---
services/self-service/pom.xml | 6 ----
.../backendapi/interceptor/AuditInterceptor.java | 39 ++++++++++++----------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/services/self-service/pom.xml b/services/self-service/pom.xml
index 9ea6a9a..f21caf9 100644
--- a/services/self-service/pom.xml
+++ b/services/self-service/pom.xml
@@ -54,12 +54,6 @@
<groupId>com.novemberain</groupId>
<artifactId>quartz-mongodb</artifactId>
<version>2.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.mongodb</groupId>
- <artifactId>mongodb-driver</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.epam.dlab</groupId>
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java
index 4b1b0ca..79b138b 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java
@@ -25,6 +25,7 @@ import com.epam.dlab.backendapi.annotation.Info;
import com.epam.dlab.backendapi.annotation.Project;
import com.epam.dlab.backendapi.annotation.ResourceName;
import com.epam.dlab.backendapi.annotation.User;
+import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.domain.AuditActionEnum;
import com.epam.dlab.backendapi.domain.AuditDTO;
import com.epam.dlab.backendapi.domain.AuditResourceTypeEnum;
@@ -46,27 +47,31 @@ import java.util.stream.IntStream;
public class AuditInterceptor implements MethodInterceptor {
@Inject
private AuditService auditService;
+ @Inject
+ private SelfServiceApplicationConfiguration configuration;
@Override
public Object invoke(MethodInvocation mi) throws Throwable {
- Method method = mi.getMethod();
- final Parameter[] parameters = mi.getMethod().getParameters();
- final String user = getUserInfo(mi, parameters);
- final AuditActionEnum action = getAuditAction(method);
- final AuditResourceTypeEnum resourceType = getResourceType(method);
- final String project = getProject(mi, parameters);
- final String resourceName = getResourceName(mi, parameters);
- final String auditInfo = getInfo(mi, parameters);
+ if (configuration.isAuditEnabled()) {
+ Method method = mi.getMethod();
+ final Parameter[] parameters = mi.getMethod().getParameters();
+ final String user = getUserInfo(mi, parameters);
+ final AuditActionEnum action = getAuditAction(method);
+ final AuditResourceTypeEnum resourceType = getResourceType(method);
+ final String project = getProject(mi, parameters);
+ final String resourceName = getResourceName(mi, parameters);
+ final String auditInfo = getInfo(mi, parameters);
- AuditDTO auditCreateDTO = AuditDTO.builder()
- .user(user)
- .action(action)
- .type(resourceType)
- .project(project)
- .resourceName(resourceName)
- .info(auditInfo)
- .build();
- auditService.save(auditCreateDTO);
+ AuditDTO auditCreateDTO = AuditDTO.builder()
+ .user(user)
+ .action(action)
+ .type(resourceType)
+ .project(project)
+ .resourceName(resourceName)
+ .info(auditInfo)
+ .build();
+ auditService.save(auditCreateDTO);
+ }
return mi.proceed();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
