You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/07/31 12:52:53 UTC
[incubator-dlab] branch develop updated: Sonar code smell changes
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 203c99a Sonar code smell changes
203c99a is described below
commit 203c99a1b7292b5525ce8adb54695fa61fd7f484
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Fri Jul 31 15:52:34 2020 +0300
Sonar code smell changes
---
.../com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 2 +-
.../com/epam/dlab/backendapi/dao/SecurityDAO.java | 44 +++++++++++-----------
.../epam/dlab/backendapi/domain/EndpointDTO.java | 1 -
.../resources/ImageExploratoryResource.java | 2 +-
.../resources/LibExploratoryResource.java | 1 -
.../resources/callback/GitCredsCallback.java | 3 --
.../resources/callback/LibraryCallback.java | 2 -
.../resources/callback/ReuploadKeyCallback.java | 2 -
.../com/epam/dlab/backendapi/roles/UserRole.java | 8 +++-
.../backendapi/service/ExternalLibraryService.java | 1 +
.../dlab/backendapi/service/GuacamoleService.java | 1 +
.../backendapi/service/KeycloakServiceImpl.java | 7 ++--
.../backendapi/service/ReuploadKeyService.java | 3 +-
.../dlab/backendapi/service/SystemInfoService.java | 1 +
.../epam/dlab/backendapi/service/TagService.java | 1 +
.../backendapi/service/impl/BucketServiceImpl.java | 7 ++--
.../impl/InfrastructureTemplateServiceImpl.java | 6 ++-
.../service/impl/UserGroupServiceImpl.java | 7 ++--
.../epam/dlab/backendapi/util/CSVFormatter.java | 24 ++++++------
19 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
index fefa1a4..9886449 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
@@ -57,7 +57,7 @@ import static com.mongodb.client.model.Filters.in;
import static com.mongodb.client.model.Filters.lte;
public class AuditDAOImpl extends BaseDAO implements AuditDAO {
- private final static String AUDIT_COLLECTION = "audit";
+ private static final String AUDIT_COLLECTION = "audit";
private static final String RESOURCE_NAME_FIELD = "resourceName";
private static final String RESOURCE_TYPE_FIELD = "type";
private static final String TIMESTAMP_FIELD = "timestamp";
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SecurityDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SecurityDAO.java
index 0c76422..a0ec24f 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SecurityDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SecurityDAO.java
@@ -20,10 +20,8 @@
package com.epam.dlab.backendapi.dao;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.auth.dto.UserCredentialDTO;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.exceptions.DlabException;
-import com.epam.dlab.util.UsernameUtils;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.mongodb.client.FindIterable;
@@ -31,35 +29,35 @@ import com.mongodb.client.model.Projections;
import org.bson.Document;
import org.keycloak.representations.AccessTokenResponse;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
import java.util.stream.Collectors;
-import static com.epam.dlab.backendapi.dao.MongoCollections.LOGIN_ATTEMPTS;
import static com.epam.dlab.backendapi.dao.MongoCollections.ROLES;
-import static com.mongodb.client.model.Filters.*;
-import static com.mongodb.client.model.Projections.*;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.gte;
+import static com.mongodb.client.model.Filters.ne;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
/**
* DAO write the attempt of user login into DLab.
*/
@Singleton
public class SecurityDAO extends BaseDAO {
-
- @Inject
- private SelfServiceApplicationConfiguration conf;
private static final String SECURITY_COLLECTION = "security";
private static final String TOKEN_RESPONSE = "tokenResponse";
+ private static final String LAST_ACCESS = "last_access";
- /**
- * Write the attempt of user login into Mongo database.
- *
- * @param credentials user credentials.
- */
- public void writeLoginAttempt(UserCredentialDTO credentials) {
- insertOne(LOGIN_ATTEMPTS,
- () -> new Document("login", credentials.getUsername()).append("iamlogin", UsernameUtils.removeDomain
- (credentials.getUsername())));
- }
+ @Inject
+ private SelfServiceApplicationConfiguration conf;
/**
* Return the roles or throw exception if roles collection does not exists.
@@ -83,7 +81,7 @@ public class SecurityDAO extends BaseDAO {
new Document()
.append(ID, userName)
.append("created", new Date())
- .append("last_access", new Date())
+ .append(LAST_ACCESS, new Date())
.append(TOKEN_RESPONSE, convertToBson(accessTokenResponse))),
true);
}
@@ -93,15 +91,15 @@ public class SecurityDAO extends BaseDAO {
new Document(SET,
new Document()
.append(ID, userName)
- .append("last_access", new Date())
+ .append(LAST_ACCESS, new Date())
.append(TOKEN_RESPONSE, convertToBson(accessTokenResponse))));
}
public Optional<UserInfo> getUser(String token) {
return Optional.ofNullable(mongoService.getCollection(SECURITY_COLLECTION)
- .findOneAndUpdate(and(eq(TOKEN_RESPONSE + ".access_token", token), gte("last_access",
+ .findOneAndUpdate(and(eq(TOKEN_RESPONSE + ".access_token", token), gte(LAST_ACCESS,
new Date(new Date().getTime() - conf.getInactiveUserTimeoutMillSec()))), new Document("$set",
- new Document("last_access", new Date()))))
+ new Document(LAST_ACCESS, new Date()))))
.map(d -> new UserInfo(d.getString(ID), token));
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java
index f288a68..fcf2475 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointDTO.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.NotEmpty;
import org.hibernate.validator.constraints.URL;
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ImageExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ImageExploratoryResource.java
index 282e1c6..e43f8c4 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ImageExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ImageExploratoryResource.java
@@ -53,7 +53,7 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON)
@Slf4j
public class ImageExploratoryResource {
- private final static String AUDIT_MESSAGE = "Create image: %s";
+ private static final String AUDIT_MESSAGE = "Create image: %s";
private final ImageExploratoryService imageExploratoryService;
private final RequestId requestId;
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
index 2244460..1e4ee7b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
@@ -60,7 +60,6 @@ import java.util.stream.Collectors;
@Produces(MediaType.APPLICATION_JSON)
@Slf4j
public class LibExploratoryResource {
- private static final String DROPWIZARD_ARTIFACT = "io.dropwizard:dropwizard-core:1.3.5";
private static final String AUDIT_MESSAGE = "Install libs: %s";
private final ExternalLibraryService externalLibraryService;
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/GitCredsCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/GitCredsCallback.java
index 5570232..3ef98c2 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/GitCredsCallback.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/GitCredsCallback.java
@@ -19,13 +19,11 @@
package com.epam.dlab.backendapi.resources.callback;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.exploratory.ExploratoryStatusDTO;
import com.epam.dlab.rest.contracts.ApiCallbacks;
import com.google.inject.Inject;
-import io.dropwizard.auth.Auth;
import lombok.extern.slf4j.Slf4j;
import javax.ws.rs.Consumes;
@@ -54,7 +52,6 @@ public class GitCredsCallback {
@Path(ApiCallbacks.STATUS_URI)
public Response status(ExploratoryStatusDTO dto) {
if (UserInstanceStatus.CREATED != UserInstanceStatus.of(dto.getStatus())) {
- //TODO Handle error status?
log.error("Git creds has not been updated for exploratory environment {} for user {}, status is {}",
dto.getExploratoryName(), dto.getUser(), dto.getStatus());
} else {
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/LibraryCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/LibraryCallback.java
index be8c2f1..6eaedf9 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/LibraryCallback.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/LibraryCallback.java
@@ -19,7 +19,6 @@
package com.epam.dlab.backendapi.resources.callback;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.dao.ExploratoryLibDAO;
import com.epam.dlab.backendapi.domain.ExploratoryLibCache;
import com.epam.dlab.backendapi.domain.RequestId;
@@ -28,7 +27,6 @@ import com.epam.dlab.dto.exploratory.LibInstallStatusDTO;
import com.epam.dlab.dto.exploratory.LibListStatusDTO;
import com.epam.dlab.exceptions.DlabException;
import com.google.inject.Inject;
-import io.dropwizard.auth.Auth;
import lombok.extern.slf4j.Slf4j;
import javax.ws.rs.Consumes;
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ReuploadKeyCallback.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ReuploadKeyCallback.java
index 837498a..51324a4 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ReuploadKeyCallback.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ReuploadKeyCallback.java
@@ -19,12 +19,10 @@
package com.epam.dlab.backendapi.resources.callback;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.domain.RequestId;
import com.epam.dlab.backendapi.service.ReuploadKeyService;
import com.epam.dlab.dto.reuploadkey.ReuploadKeyStatusDTO;
import com.google.inject.Inject;
-import io.dropwizard.auth.Auth;
import lombok.extern.slf4j.Slf4j;
import javax.ws.rs.Consumes;
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRole.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRole.java
index e5343dd..bb16414 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRole.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/roles/UserRole.java
@@ -120,8 +120,12 @@ public class UserRole implements Comparable<UserRole> {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
UserRole userRole = (UserRole) o;
return this.id.equals(userRole.getId()) && this.type.equals(userRole.getType()) && this.name.equals(userRole.getName());
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExternalLibraryService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExternalLibraryService.java
index 9298c5c..2ecd82a 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExternalLibraryService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExternalLibraryService.java
@@ -21,6 +21,7 @@ package com.epam.dlab.backendapi.service;
import com.epam.dlab.backendapi.resources.dto.LibraryDTO;
+@FunctionalInterface
public interface ExternalLibraryService {
LibraryDTO getLibrary(String groupId, String artifactId, String version);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java
index 776e409..68df4b1 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java
@@ -22,6 +22,7 @@ package com.epam.dlab.backendapi.service;
import com.epam.dlab.auth.UserInfo;
import org.apache.guacamole.net.GuacamoleTunnel;
+@FunctionalInterface
public interface GuacamoleService {
GuacamoleTunnel getTunnel(UserInfo userInfo, String host, String endpoint);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java
index ea7e50a..871839d 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/KeycloakServiceImpl.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response;
public class KeycloakServiceImpl implements KeycloakService {
private static final String URI = "/realms/%s/protocol/openid-connect/token";
+ private static final String GRANT_TYPE = "grant_type";
private final Client httpClient;
private final KeycloakConfiguration conf;
private final SecurityDAO securityDAO;
@@ -92,19 +93,19 @@ public class KeycloakServiceImpl implements KeycloakService {
private Form accessTokenRequestForm(String code) {
return new Form()
- .param("grant_type", "authorization_code")
+ .param(GRANT_TYPE, "authorization_code")
.param("code", code)
.param("redirect_uri", redirectUri);
}
private Form refreshTokenRequestForm(String refreshToken) {
return new Form()
- .param("grant_type", "refresh_token")
+ .param(GRANT_TYPE, "refresh_token")
.param("refresh_token", refreshToken);
}
private Form serviceAccountRequestForm() {
return new Form()
- .param("grant_type", "client_credentials");
+ .param(GRANT_TYPE, "client_credentials");
}
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ReuploadKeyService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ReuploadKeyService.java
index 0c2b199..25d2cc0 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ReuploadKeyService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ReuploadKeyService.java
@@ -19,10 +19,9 @@
package com.epam.dlab.backendapi.service;
-import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.dto.reuploadkey.ReuploadKeyStatusDTO;
-import com.epam.dlab.model.ResourceData;
+@FunctionalInterface
public interface ReuploadKeyService {
void updateResourceData(ReuploadKeyStatusDTO dto);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/SystemInfoService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/SystemInfoService.java
index b3802ce..6e6a576 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/SystemInfoService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/SystemInfoService.java
@@ -20,6 +20,7 @@ package com.epam.dlab.backendapi.service;
import com.epam.dlab.backendapi.resources.dto.SystemInfoDto;
+@FunctionalInterface
public interface SystemInfoService {
SystemInfoDto getSystemInfo();
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java
index a095fbc..b5451ca 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/TagService.java
@@ -23,6 +23,7 @@ import com.epam.dlab.auth.UserInfo;
import java.util.Map;
+@FunctionalInterface
public interface TagService {
Map<String, String> getResourceTags(UserInfo userInfo, String endpoint, String project, String customTag);
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
index a8487ba..8049857 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
@@ -66,6 +66,7 @@ public class BucketServiceImpl implements BucketService {
private static final String BUCKET_UPLOAD_FOLDER = "%sbucket/folder/upload";
private static final String BUCKET_DOWNLOAD_OBJECT = "%sbucket/%s/object/%s/download";
private static final String BUCKET_DELETE_OBJECT = "%sbucket/objects/delete";
+ private static final String SOMETHING_WENT_WRONG_MESSAGE = "Something went wrong. Response status is %s ";
private final EndpointService endpointService;
private final RESTService provisioningService;
@@ -97,7 +98,7 @@ public class BucketServiceImpl implements BucketService {
FormDataMultiPart formData = getFormDataMultiPart(bucket, object, inputStream, contentType, fileSize);
Response response = provisioningService.postForm(String.format(BUCKET_UPLOAD_OBJECT, endpointDTO.getUrl()), userInfo.getAccessToken(), formData, Response.class);
if (response.getStatus() != HttpStatus.SC_OK) {
- throw new DlabException(String.format("Something went wrong. Response status is %s ", response.getStatus()));
+ throw new DlabException(String.format(SOMETHING_WENT_WRONG_MESSAGE, response.getStatus()));
}
} catch (Exception e) {
log.error("Cannot upload object {} to bucket {} for user {}, endpoint {}. Reason {}", object, bucket, userInfo.getName(), endpoint, e.getMessage(), e);
@@ -118,7 +119,7 @@ public class BucketServiceImpl implements BucketService {
FolderUploadDTO dto = new FolderUploadDTO(bucket, folder);
Response response = provisioningService.post(String.format(BUCKET_UPLOAD_FOLDER, endpointDTO.getUrl()), userInfo.getAccessToken(), dto, Response.class);
if (response.getStatus() != HttpStatus.SC_OK) {
- throw new DlabException(String.format("Something went wrong. Response status is %s ", response.getStatus()));
+ throw new DlabException(String.format(SOMETHING_WENT_WRONG_MESSAGE, response.getStatus()));
}
} catch (Exception e) {
log.error("Cannot upload folder {} to bucket {} for user {}, endpoint {}. Reason {}", folder, bucket, userInfo.getName(), endpoint, e.getMessage(), e);
@@ -150,7 +151,7 @@ public class BucketServiceImpl implements BucketService {
BucketDeleteDTO bucketDeleteDTO = new BucketDeleteDTO(bucket, objects);
Response response = provisioningService.post(String.format(BUCKET_DELETE_OBJECT, endpointDTO.getUrl()), userInfo.getAccessToken(), bucketDeleteDTO, Response.class);
if (response.getStatus() != HttpStatus.SC_OK) {
- throw new DlabException(String.format("Something went wrong. Response status is %s ", response.getStatus()));
+ throw new DlabException(String.format(SOMETHING_WENT_WRONG_MESSAGE, response.getStatus()));
}
} catch (Exception e) {
log.error("Cannot delete objects {} from bucket {} for user {}, endpoint {}. Reason {}", objects, bucket, userInfo.getName(), endpoint, e.getMessage(), e);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
index bce70c3..03f093b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceImpl.java
@@ -52,6 +52,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+import static com.epam.dlab.cloud.CloudProvider.AZURE;
import static com.epam.dlab.rest.contracts.DockerAPI.DOCKER_COMPUTATIONAL;
import static com.epam.dlab.rest.contracts.DockerAPI.DOCKER_EXPLORATORY;
@@ -144,7 +145,7 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
* Temporary filter for creation of exploratory env due to Azure issues
*/
private boolean exploratoryGpuIssuesAzureFilter(ExploratoryMetadataDTO e, CloudProvider cloudProvider) {
- return (!"redhat".equals(settingsDAO.getConfOsFamily()) || cloudProvider != CloudProvider.AZURE) ||
+ return (!"redhat".equals(settingsDAO.getConfOsFamily()) || cloudProvider != AZURE) ||
!(e.getImage().endsWith("deeplearning") || e.getImage().endsWith("tensor"));
}
@@ -203,7 +204,8 @@ public class InfrastructureTemplateServiceImpl implements InfrastructureTemplate
.minDataprocPreemptibleInstanceCount(configuration.getMinDataprocPreemptibleCount())
.build());
case AZURE:
- log.error("Dataengine service is not supported currently for {}", cloudProvider);
+ log.error("Dataengine service is not supported currently for {}", AZURE);
+ throw new UnsupportedOperationException("Dataengine service is not supported currently for " + AZURE);
default:
throw new UnsupportedOperationException("Dataengine service is not supported currently for " + cloudProvider);
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
index 32358f0..0475492 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
@@ -65,6 +65,7 @@ public class UserGroupServiceImpl implements UserGroupService {
private static final String ROLE_NOT_FOUND_MSG = "Any of role : %s were not found";
private static final String ADMIN = "admin";
private static final String PROJECT_ADMIN = "projectAdmin";
+ private static final String INAPPROPRIATE_PERMISSION = "User %s doesn't have appropriate permission";
private final UserGroupDAO userGroupDao;
private final UserRoleDAO userRoleDao;
@@ -103,10 +104,10 @@ public class UserGroupServiceImpl implements UserGroupService {
.flatMap(Collection::stream)
.filter(g -> g.equalsIgnoreCase(group))
.findAny()
- .orElseThrow(() -> new DlabException(String.format("User %s doesn't have appropriate permission", userInfo.getName())));
+ .orElseThrow(() -> new DlabException(String.format(INAPPROPRIATE_PERMISSION, userInfo.getName())));
updateGroup(userInfo.getName(), group, roles, users);
} else {
- throw new DlabException(String.format("User %s doesn't have appropriate permission", userInfo.getName()));
+ throw new DlabException(String.format(INAPPROPRIATE_PERMISSION, userInfo.getName()));
}
}
@@ -140,7 +141,7 @@ public class UserGroupServiceImpl implements UserGroupService {
.filter(userGroup -> groups.contains(userGroup.getGroup()) && !containsAdministrationPermissions(userGroup))
.collect(Collectors.toList());
} else {
- throw new DlabException(String.format("User %s doesn't have appropriate permission", user.getName()));
+ throw new DlabException(String.format(INAPPROPRIATE_PERMISSION, user.getName()));
}
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/CSVFormatter.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/CSVFormatter.java
index 7f0bbf7..a42a76d 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/CSVFormatter.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/CSVFormatter.java
@@ -22,21 +22,21 @@ package com.epam.dlab.backendapi.util;
import java.util.List;
public class CSVFormatter {
+ public static final char SEPARATOR = ',';
- private CSVFormatter() {
- }
+ private CSVFormatter() {
+ }
- public static final char SEPARATOR = ',';
- public static String formatLine(List<String> values, char separator) {
- boolean first = true;
- StringBuilder builder = new StringBuilder();
- for (String value : values) {
- if (!first) {
- builder.append(separator);
- }
- builder.append(followCsvStandard(value));
- first = false;
+ public static String formatLine(List<String> values, char separator) {
+ boolean first = true;
+ StringBuilder builder = new StringBuilder();
+ for (String value : values) {
+ if (!first) {
+ builder.append(separator);
+ }
+ builder.append(followCsvStandard(value));
+ first = false;
}
return builder.append(System.lineSeparator()).toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org