[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch sonar in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/sonar by this push: new e9ea179 [DLAB-1870] Intigration with sonar e9ea179 is described below commit e9ea179f40ea075a22691482c579a90b2f14da78 Author: Oleh Fuks AuthorDate: Wed Jul 22 19:12:01 2020 +0300 [DLAB-1870] Intigration with sonar --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b79377..03edbec 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ http://localhost:9000/sonar -**/*Exception.java +**/*Exception.java, src/main/java/com/epam/dlab/dto/**, src/main/java/com/epam/dlab/backendapi/auth/**, src/main/java/com/epam/dlab/backendapi/conf/**, - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch sonar in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/sonar by this push: new 4e6dc6e [DLAB-1870] Intigration with sonar 4e6dc6e is described below commit 4e6dc6eac7ef08f25429bfee168528127626a37a Author: Oleh Fuks AuthorDate: Wed Jul 22 19:11:50 2020 +0300 [DLAB-1870] Intigration with sonar --- pom.xml | 1 + services/common/pom.xml | 4 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1f153c7..6b79377 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ http://localhost:9000/sonar +**/*Exception.java src/main/java/com/epam/dlab/dto/**, src/main/java/com/epam/dlab/backendapi/auth/**, src/main/java/com/epam/dlab/backendapi/conf/**, diff --git a/services/common/pom.xml b/services/common/pom.xml index 60d70fe..1bf66dd 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -28,8 +28,4 @@ common - - -true - - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/sonar by this push:
new 07b88e0 [DLAB-1870] Intigration with sonar
07b88e0 is described below
commit 07b88e0e362cc51497d21a0f28501cc0bbd7841e
Author: Oleh Fuks
AuthorDate: Wed Jul 22 19:00:51 2020 +0300
[DLAB-1870] Intigration with sonar
---
pom.xml| 1 +
services/common/pom.xml| 4 +++
.../dlab/auth/conf/AzureLoginConfiguration.java| 39 --
.../epam/dlab/auth/conf/GcpLoginConfiguration.java | 33 --
4 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/pom.xml b/pom.xml
index d6f6207..1f153c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,7 @@
1.2.3
1.3.3
+
diff --git a/services/common/pom.xml b/services/common/pom.xml
index 1bf66dd..60d70fe 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -28,4 +28,8 @@
common
+
+
+true
+
diff --git
a/services/common/src/main/java/com/epam/dlab/auth/conf/AzureLoginConfiguration.java
b/services/common/src/main/java/com/epam/dlab/auth/conf/AzureLoginConfiguration.java
deleted file mode 100644
index cf6331c..000
---
a/services/common/src/main/java/com/epam/dlab/auth/conf/AzureLoginConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.epam.dlab.auth.conf;
-
-import lombok.Getter;
-
-@Getter
-public class AzureLoginConfiguration {
- private boolean useLdap;
- private boolean silent;
- private String tenant;
- private String authority;
- private String clientId;
- private String redirectUrl;
- private String responseMode;
- private String prompt;
- private String loginPage;
- private boolean validatePermissionScope;
- private String permissionScope;
- private String managementApiAuthFile;
- private long maxSessionDurabilityMilliseconds = 8L * 60L * 60L *
1000L;// 8 hours
-}
diff --git
a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
b/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
deleted file mode 100644
index 6dbaf02..000
---
a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.epam.dlab.auth.conf;
-
-import lombok.Data;
-
-@Data
-public class GcpLoginConfiguration {
- private final boolean oauth2authenticationEnabled;
- private final String redirectedUri;
- private final String clientId;
- private final String clientSecret;
- private final String applicationName;
- private final int userStateCacheSize;
- private final long userStateCacheExpirationTime;
-}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch sonar in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/sonar by this push: new fab7998 [DLAB-1870] Intigration with sonar fab7998 is described below commit fab7998cf2e6f6012c7f44250ea7f3da21beca9a Author: Oleh Fuks AuthorDate: Wed Jul 22 17:14:35 2020 +0300 [DLAB-1870] Intigration with sonar --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97bbe31..d6f6207 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ -http://jenkins.develop.dlabanalytics.com:9000/sonar +http://localhost:9000/sonar src/main/java/com/epam/dlab/dto/**, - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/sonar by this push:
new 1b46e4c [DLAB-1870] Intigration with sonar
1b46e4c is described below
commit 1b46e4cd3fabf1c0d8862311fbffc67ff215d48b
Author: Oleh Fuks
AuthorDate: Wed Jul 22 17:10:43 2020 +0300
[DLAB-1870] Intigration with sonar
---
pom.xml | 35 +--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e24bfd9..97bbe31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,34 @@
services/billing-gcp
+
+sonar
+
+false
+
+
+
+http://jenkins.develop.dlabanalytics.com:9000/sonar
+
+
+src/main/java/com/epam/dlab/dto/**,
+src/main/java/com/epam/dlab/backendapi/auth/**,
+src/main/java/com/epam/dlab/backendapi/conf/**,
+src/main/java/com/epam/dlab/backendapi/domain/**,
+src/main/java/com/epam/dlab/backendapi/dropwizard/**,
+src/main/java/com/epam/dlab/backendapi/healthcheck/**,
+src/main/java/com/epam/dlab/backendapi/modules/**,
+src/main/java/com/epam/dlab/backendapi/resources/dto/**,
+src/main/java/com/epam/dlab/backendapi/roles/**,
+
src/main/java/com/epam/dlab/backendapi/servlet/guacamole/**,
+src/main/java/com/epam/dlab/backendapi/util/**,
+src/main/java/com/epam/dlab/backendapi/validation/**,
+src/main/java/com/epam/dlab/process/**,
+src/main/java/com/epam/dlab/backendapi/modules/**,
+src/main/java/com/epam/dlab/backendapi/validation/**
+
+
+
@@ -130,8 +158,6 @@
dropwizard-util
${io.dropwizard.version}
-
-
@@ -174,6 +200,11 @@
+
+org.sonarsource.scanner.maven
+sonar-maven-plugin
+3.7.0.1746
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/sonar by this push:
new 0309886 [DLAB-1870] Intigration with sonar
0309886 is described below
commit 030988680acba8baf609bb51aa8ffc4ed8cb6f19
Author: Oleh Fuks
AuthorDate: Wed Jul 22 15:20:29 2020 +0300
[DLAB-1870] Intigration with sonar
---
.../dlab/backendapi/interceptor/BudgetLimitInterceptor.java | 11 ---
1 file changed, 11 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java
index ce32e10..a9058bd 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/BudgetLimitInterceptor.java
@@ -19,7 +19,6 @@
package com.epam.dlab.backendapi.interceptor;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.annotation.Project;
import com.epam.dlab.backendapi.dao.BillingDAO;
import com.epam.dlab.backendapi.service.BillingService;
@@ -31,7 +30,6 @@ import org.aopalliance.intercept.MethodInvocation;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
-import java.util.Arrays;
import java.util.Objects;
import java.util.stream.IntStream;
@@ -53,15 +51,6 @@ public class BudgetLimitInterceptor implements
MethodInterceptor {
}
}
- private Boolean userQuoteReached(MethodInvocation mi) {
- return Arrays.stream(mi.getArguments())
- .filter(arg ->
arg.getClass().equals(UserInfo.class))
- .findAny()
- .map(u -> ((UserInfo) u).getName())
- .map(billingDAO::isUserQuoteReached)
- .orElse(Boolean.FALSE);
- }
-
private Boolean projectQuoteReached(MethodInvocation mi) {
final Parameter[] parameters = mi.getMethod().getParameters();
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch sonar updated: [DLAB-1870] Intigration with sonar
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/sonar by this push:
new dce5820 [DLAB-1870] Intigration with sonar
dce5820 is described below
commit dce5820e4b18eb593f9f7c9c6555a313be8b1191
Author: Oleh Fuks
AuthorDate: Wed Jul 22 13:46:55 2020 +0300
[DLAB-1870] Intigration with sonar
---
services/billing-aws/src/main/java/com/epam/dlab/BillingService.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/services/billing-aws/src/main/java/com/epam/dlab/BillingService.java
b/services/billing-aws/src/main/java/com/epam/dlab/BillingService.java
index 9b4d6db..15dcc32 100644
--- a/services/billing-aws/src/main/java/com/epam/dlab/BillingService.java
+++ b/services/billing-aws/src/main/java/com/epam/dlab/BillingService.java
@@ -23,6 +23,7 @@ import com.epam.dlab.dto.billing.BillingData;
import java.util.List;
+@FunctionalInterface
public interface BillingService {
List getBillingData();
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
