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 3dec71f Updated name of classes/interfaces
3dec71f is described below
commit 3dec71f94182e11b1338e0b00932f35c878df8c7
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Wed Jul 29 18:51:11 2020 +0300
Updated name of classes/interfaces
---
.../dao/{BackupDao.java => BackupDAO.java} | 2 +-
.../dao/{BackupDaoImpl.java => BackupDAOImpl.java} | 2 +-
...xploratoryDao.java => ImageExploratoryDAO.java} | 2 +-
...ryDaoImpl.java => ImageExploratoryDAOImpl.java} | 16 ++++++---
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 4 +--
.../dao/{UserGroupDao.java => UserGroupDAO.java} | 4 +--
...UserGroupDaoImpl.java => UserGroupDAOImpl.java} | 2 +-
.../dao/{UserRoleDao.java => UserRoleDAO.java} | 2 +-
.../{UserRoleDaoImpl.java => UserRoleDAOImpl.java} | 2 +-
.../dropwizard/listeners/MongoStartupListener.java | 6 ++--
.../epam/dlab/backendapi/modules/DevModule.java | 24 ++++++-------
.../dlab/backendapi/modules/ProductionModule.java | 24 ++++++-------
.../backendapi/service/UserRoleServiceImpl.java | 4 +--
.../backendapi/service/impl/BackupServiceImpl.java | 4 +--
.../service/impl/BillingServiceImpl.java | 6 ++--
.../service/impl/EndpointServiceImpl.java | 6 ++--
.../service/impl/ExploratoryServiceImpl.java | 10 +++---
.../service/impl/ImageExploratoryServiceImpl.java | 38 ++++++++++----------
.../impl/InfrastructureTemplateServiceImpl.java | 4 +--
.../service/impl/ProjectServiceImpl.java | 6 ++--
.../service/impl/UserGroupServiceImpl.java | 12 +++----
.../service/UserRoleServiceImplTest.java | 18 +++++-----
.../service/impl/BackupServiceImplTest.java | 15 ++++++--
.../impl/ImageExploratoryServiceImplTest.java | 4 +--
.../InfrastructureTemplateServiceBaseTest.java | 4 +--
.../service/impl/UserGroupServiceImplTest.java | 42 +++++++++++-----------
26 files changed, 140 insertions(+), 123 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAO.java
similarity index 97%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDao.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAO.java
index e48c5ea..1a2a11c 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAO.java
@@ -26,7 +26,7 @@ import com.epam.dlab.dto.backup.EnvBackupStatus;
import java.util.List;
import java.util.Optional;
-public interface BackupDao {
+public interface BackupDAO {
void createOrUpdate(EnvBackupDTO dto, String user, EnvBackupStatus
status);
List<BackupInfoRecord> getBackups(String userName);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDaoImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAOImpl.java
similarity index 97%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDaoImpl.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAOImpl.java
index f1b599c..4ed2788 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDaoImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BackupDAOImpl.java
@@ -34,7 +34,7 @@ import static com.mongodb.client.model.Filters.and;
import static com.mongodb.client.model.Filters.eq;
@Singleton
-public class BackupDaoImpl extends BaseDAO implements BackupDao {
+public class BackupDAOImpl extends BaseDAO implements BackupDAO {
@Override
public void createOrUpdate(EnvBackupDTO dto, String user,
EnvBackupStatus status) {
final Document idField = backupId(user, dto.getId());
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAO.java
similarity index 97%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDao.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAO.java
index 2665d47..9bab74d 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAO.java
@@ -28,7 +28,7 @@ import com.epam.dlab.model.library.Library;
import java.util.List;
import java.util.Optional;
-public interface ImageExploratoryDao {
+public interface ImageExploratoryDAO {
boolean exist(String image, String project);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAOImpl.java
similarity index 90%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAOImpl.java
index 808dfbe..7aadcc4 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ImageExploratoryDAOImpl.java
@@ -28,15 +28,23 @@ import com.google.inject.Singleton;
import org.bson.Document;
import org.bson.conversions.Bson;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
-import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.in;
import static com.mongodb.client.model.Projections.elemMatch;
-import static com.mongodb.client.model.Projections.*;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
@Singleton
-public class ImageExploratoryDaoImpl extends BaseDAO implements
ImageExploratoryDao {
+public class ImageExploratoryDAOImpl extends BaseDAO implements
ImageExploratoryDAO {
private static final String LIBRARIES = "libraries";
private static final String IMAGE_NAME = "name";
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
index c7ced30..99073d1 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
@@ -59,10 +59,10 @@ public class ProjectDAOImpl extends BaseDAO implements
ProjectDAO {
private static final String ENDPOINT_FIELD = "endpoints.$.";
private static final String ANYUSER = Pattern.quote("$anyuser");
- private final UserGroupDao userGroupDao;
+ private final UserGroupDAO userGroupDao;
@Inject
- public ProjectDAOImpl(UserGroupDao userGroupDao) {
+ public ProjectDAOImpl(UserGroupDAO userGroupDao) {
this.userGroupDao = userGroupDao;
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAO.java
similarity index 93%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAO.java
index 85ec7ae..9d6b72b 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAO.java
@@ -20,7 +20,7 @@ package com.epam.dlab.backendapi.dao;
import java.util.Set;
-public interface UserGroupDao {
+public interface UserGroupDAO {
void addUsers(String group, Set<String> users);
void updateUsers(String group, Set<String> users);
@@ -29,5 +29,5 @@ public interface UserGroupDao {
Set<String> getUserGroups(String user);
- Set<String> getUsers(String group);
+ Set<String> getUsers(String group);
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAOImpl.java
similarity index 97%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAOImpl.java
index ac66946..39fc11a 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDaoImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserGroupDAOImpl.java
@@ -32,7 +32,7 @@ import static com.mongodb.client.model.Filters.elemMatch;
import static com.mongodb.client.model.Filters.eq;
@Singleton
-public class UserGroupDaoImpl extends BaseDAO implements UserGroupDao {
+public class UserGroupDAOImpl extends BaseDAO implements UserGroupDAO {
private static final String USERS_FIELD = "users";
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAO.java
similarity index 98%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAO.java
index 48abb54..5de090c 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAO.java
@@ -26,7 +26,7 @@ import com.epam.dlab.cloud.CloudProvider;
import java.util.List;
import java.util.Set;
-public interface UserRoleDao {
+public interface UserRoleDAO {
List<UserRoleDto> findAll();
void insert(UserRoleDto dto);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAOImpl.java
similarity index 99%
rename from
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
rename to
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAOImpl.java
index c38b3e9..2eced33 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDAOImpl.java
@@ -55,7 +55,7 @@ import static java.util.stream.Collectors.toList;
@Singleton
@Slf4j
-public class UserRoleDaoImpl extends BaseDAO implements UserRoleDao {
+public class UserRoleDAOImpl extends BaseDAO implements UserRoleDAO {
private static final ObjectMapper MAPPER = new ObjectMapper();
private static final String[] DEFAULT_AWS_SHAPES =
{"nbShapes_t2.medium_fetching", "compShapes_c4.xlarge_fetching"};
private static final String[] DEFAULT_GCP_SHAPES =
{"compShapes_n1-standard-2_fetching", "nbShapes_n1-standard-2_fetching"};
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
index c291609..d029e86 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dropwizard/listeners/MongoStartupListener.java
@@ -22,7 +22,7 @@ package com.epam.dlab.backendapi.dropwizard.listeners;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.EndpointDAO;
import com.epam.dlab.backendapi.dao.SettingsDAO;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
import com.epam.dlab.cloud.CloudProvider;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -51,13 +51,13 @@ public class MongoStartupListener implements
ServerLifecycleListener {
private static final String ROLES_FILE_FORMAT =
"/mongo/%s/mongo_roles.json";
private static final ObjectMapper MAPPER = new ObjectMapper();
- private final UserRoleDao userRoleDao;
+ private final UserRoleDAO userRoleDao;
private final SelfServiceApplicationConfiguration configuration;
private final SettingsDAO settingsDAO;
private final EndpointDAO endpointDAO;
@Inject
- public MongoStartupListener(UserRoleDao userRoleDao,
SelfServiceApplicationConfiguration configuration,
+ public MongoStartupListener(UserRoleDAO userRoleDao,
SelfServiceApplicationConfiguration configuration,
SettingsDAO settingsDAO, EndpointDAO
endpointDAO) {
this.userRoleDao = userRoleDao;
this.configuration = configuration;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
index 5c8f9bf..c0c0912 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/DevModule.java
@@ -25,20 +25,20 @@ import
com.epam.dlab.backendapi.auth.SelfServiceSecurityAuthorizer;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.AuditDAO;
import com.epam.dlab.backendapi.dao.AuditDAOImpl;
-import com.epam.dlab.backendapi.dao.BackupDao;
-import com.epam.dlab.backendapi.dao.BackupDaoImpl;
+import com.epam.dlab.backendapi.dao.BackupDAO;
+import com.epam.dlab.backendapi.dao.BackupDAOImpl;
import com.epam.dlab.backendapi.dao.BaseBillingDAO;
import com.epam.dlab.backendapi.dao.BillingDAO;
import com.epam.dlab.backendapi.dao.EndpointDAO;
import com.epam.dlab.backendapi.dao.EndpointDAOImpl;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDaoImpl;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAOImpl;
import com.epam.dlab.backendapi.dao.ProjectDAO;
import com.epam.dlab.backendapi.dao.ProjectDAOImpl;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
-import com.epam.dlab.backendapi.dao.UserGroupDaoImpl;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
-import com.epam.dlab.backendapi.dao.UserRoleDaoImpl;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
+import com.epam.dlab.backendapi.dao.UserGroupDAOImpl;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
+import com.epam.dlab.backendapi.dao.UserRoleDAOImpl;
import com.epam.dlab.backendapi.service.AccessKeyService;
import com.epam.dlab.backendapi.service.ApplicationSettingService;
import com.epam.dlab.backendapi.service.ApplicationSettingServiceImpl;
@@ -145,9 +145,9 @@ public class DevModule extends
ModuleBase<SelfServiceApplicationConfiguration> i
.toInstance(configuration.getBillingFactory()
.build(environment,
ServiceConsts.BILLING_SERVICE_NAME));
bind(ImageExploratoryService.class).to(ImageExploratoryServiceImpl.class);
-
bind(ImageExploratoryDao.class).to(ImageExploratoryDaoImpl.class);
+
bind(ImageExploratoryDAO.class).to(ImageExploratoryDAOImpl.class);
bind(BackupService.class).to(BackupServiceImpl.class);
- bind(BackupDao.class).to(BackupDaoImpl.class);
+ bind(BackupDAO.class).to(BackupDAOImpl.class);
bind(ExploratoryService.class).to(ExploratoryServiceImpl.class);
bind(TagService.class).to(TagServiceImpl.class);
bind(InactivityService.class).to(InactivityServiceImpl.class);
@@ -166,8 +166,8 @@ public class DevModule extends
ModuleBase<SelfServiceApplicationConfiguration> i
bind(SystemInfoService.class).to(SystemInfoServiceImpl.class);
bind(UserGroupService.class).to(UserGroupServiceImpl.class);
bind(UserRoleService.class).to(UserRoleServiceImpl.class);
- bind(UserRoleDao.class).to(UserRoleDaoImpl.class);
- bind(UserGroupDao.class).to(UserGroupDaoImpl.class);
+ bind(UserRoleDAO.class).to(UserRoleDAOImpl.class);
+ bind(UserGroupDAO.class).to(UserGroupDAOImpl.class);
bind(ApplicationSettingService.class).to(ApplicationSettingServiceImpl.class);
bind(UserSettingService.class).to(UserSettingServiceImpl.class);
bind(GuacamoleService.class).to(GuacamoleServiceImpl.class);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
index 901a61f..2581026 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java
@@ -24,20 +24,20 @@ import
com.epam.dlab.backendapi.auth.SelfServiceSecurityAuthorizer;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.AuditDAO;
import com.epam.dlab.backendapi.dao.AuditDAOImpl;
-import com.epam.dlab.backendapi.dao.BackupDao;
-import com.epam.dlab.backendapi.dao.BackupDaoImpl;
+import com.epam.dlab.backendapi.dao.BackupDAO;
+import com.epam.dlab.backendapi.dao.BackupDAOImpl;
import com.epam.dlab.backendapi.dao.BaseBillingDAO;
import com.epam.dlab.backendapi.dao.BillingDAO;
import com.epam.dlab.backendapi.dao.EndpointDAO;
import com.epam.dlab.backendapi.dao.EndpointDAOImpl;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDaoImpl;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAOImpl;
import com.epam.dlab.backendapi.dao.ProjectDAO;
import com.epam.dlab.backendapi.dao.ProjectDAOImpl;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
-import com.epam.dlab.backendapi.dao.UserGroupDaoImpl;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
-import com.epam.dlab.backendapi.dao.UserRoleDaoImpl;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
+import com.epam.dlab.backendapi.dao.UserGroupDAOImpl;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
+import com.epam.dlab.backendapi.dao.UserRoleDAOImpl;
import com.epam.dlab.backendapi.service.AccessKeyService;
import com.epam.dlab.backendapi.service.ApplicationSettingService;
import com.epam.dlab.backendapi.service.ApplicationSettingServiceImpl;
@@ -136,9 +136,9 @@ public class ProductionModule extends
ModuleBase<SelfServiceApplicationConfigura
.toInstance(configuration.getBillingFactory()
.build(environment,
ServiceConsts.BILLING_SERVICE_NAME));
bind(ImageExploratoryService.class).to(ImageExploratoryServiceImpl.class);
-
bind(ImageExploratoryDao.class).to(ImageExploratoryDaoImpl.class);
+
bind(ImageExploratoryDAO.class).to(ImageExploratoryDAOImpl.class);
bind(BackupService.class).to(BackupServiceImpl.class);
- bind(BackupDao.class).to(BackupDaoImpl.class);
+ bind(BackupDAO.class).to(BackupDAOImpl.class);
bind(ExploratoryService.class).to(ExploratoryServiceImpl.class);
bind(Authorizer.class).to(SelfServiceSecurityAuthorizer.class);
bind(AccessKeyService.class).to(AccessKeyServiceImpl.class);
@@ -154,8 +154,8 @@ public class ProductionModule extends
ModuleBase<SelfServiceApplicationConfigura
bind(SystemInfoService.class).to(SystemInfoServiceImpl.class);
bind(UserGroupService.class).to(UserGroupServiceImpl.class);
bind(UserRoleService.class).to(UserRoleServiceImpl.class);
- bind(UserRoleDao.class).to(UserRoleDaoImpl.class);
- bind(UserGroupDao.class).to(UserGroupDaoImpl.class);
+ bind(UserRoleDAO.class).to(UserRoleDAOImpl.class);
+ bind(UserGroupDAO.class).to(UserGroupDAOImpl.class);
bind(InactivityService.class).to(InactivityServiceImpl.class);
bind(ApplicationSettingService.class).to(ApplicationSettingServiceImpl.class);
bind(UserSettingService.class).to(UserSettingServiceImpl.class);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
index 92e0afb..5f3f6a3 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
@@ -18,7 +18,7 @@
*/
package com.epam.dlab.backendapi.service;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
import com.epam.dlab.exceptions.ResourceNotFoundException;
import com.google.inject.Inject;
@@ -33,7 +33,7 @@ public class UserRoleServiceImpl implements UserRoleService {
private static final String ROLE_NOT_FOUND_MSG = "Any of role : %s were
not found";
@Inject
- private UserRoleDao userRoleDao;
+ private UserRoleDAO userRoleDao;
@Override
public List<UserRoleDto> getUserRoles() {
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BackupServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BackupServiceImpl.java
index b50b0ae..1a93470 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BackupServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BackupServiceImpl.java
@@ -20,7 +20,7 @@
package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.dao.BackupDao;
+import com.epam.dlab.backendapi.dao.BackupDAO;
import com.epam.dlab.backendapi.resources.dto.BackupInfoRecord;
import com.epam.dlab.backendapi.service.BackupService;
import com.epam.dlab.constants.ServiceConsts;
@@ -43,7 +43,7 @@ public class BackupServiceImpl implements BackupService {
private RESTService provisioningService;
@Inject
- private BackupDao backupDao;
+ private BackupDAO backupDao;
@Override
public String createBackup(EnvBackupDTO dto, UserInfo user) {
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
index 1b3c208..2810a33 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
@@ -22,7 +22,7 @@ package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.BillingDAO;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
import com.epam.dlab.backendapi.dao.ProjectDAO;
import com.epam.dlab.backendapi.domain.BillingReport;
import com.epam.dlab.backendapi.domain.BillingReportLine;
@@ -83,14 +83,14 @@ public class BillingServiceImpl implements BillingService {
private final ExploratoryService exploratoryService;
private final SelfServiceApplicationConfiguration configuration;
private final RESTService provisioningService;
- private final ImageExploratoryDao imageExploratoryDao;
+ private final ImageExploratoryDAO imageExploratoryDao;
private final BillingDAO billingDAO;
private final String sbn;
@Inject
public BillingServiceImpl(ProjectService projectService, ProjectDAO
projectDAO, EndpointService endpointService,
ExploratoryService exploratoryService,
SelfServiceApplicationConfiguration configuration,
- @Named(ServiceConsts.BILLING_SERVICE_NAME)
RESTService provisioningService, ImageExploratoryDao imageExploratoryDao,
+ @Named(ServiceConsts.BILLING_SERVICE_NAME)
RESTService provisioningService, ImageExploratoryDAO imageExploratoryDao,
BillingDAO billingDAO) {
this.projectService = projectService;
this.projectDAO = projectDAO;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java
index 7f53ca7..cbb7bd1 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EndpointServiceImpl.java
@@ -25,7 +25,7 @@ import com.epam.dlab.backendapi.annotation.ResourceName;
import com.epam.dlab.backendapi.annotation.User;
import com.epam.dlab.backendapi.dao.EndpointDAO;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.EndpointResourcesDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
@@ -62,12 +62,12 @@ public class EndpointServiceImpl implements EndpointService
{
private final ProjectService projectService;
private final ExploratoryDAO exploratoryDAO;
private final RESTService provisioningService;
- private final UserRoleDao userRoleDao;
+ private final UserRoleDAO userRoleDao;
@Inject
public EndpointServiceImpl(EndpointDAO endpointDAO, ProjectService
projectService, ExploratoryDAO exploratoryDAO,
@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService,
- UserRoleDao userRoleDao) {
+ UserRoleDAO userRoleDao) {
this.endpointDAO = endpointDAO;
this.projectService = projectService;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
index 6f72c55..250245b 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -30,7 +30,7 @@ import
com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.ComputationalDAO;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.dao.GitCredsDAO;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
import com.epam.dlab.backendapi.domain.AuditActionEnum;
import com.epam.dlab.backendapi.domain.AuditDTO;
import com.epam.dlab.backendapi.domain.AuditResourceTypeEnum;
@@ -101,7 +101,7 @@ public class ExploratoryServiceImpl implements
ExploratoryService {
private final ExploratoryDAO exploratoryDAO;
private final ComputationalDAO computationalDAO;
private final GitCredsDAO gitCredsDAO;
- private final ImageExploratoryDao imageExploratoryDao;
+ private final ImageExploratoryDAO imageExploratoryDao;
private final RESTService provisioningService;
private final RequestBuilder requestBuilder;
private final RequestId requestId;
@@ -112,9 +112,9 @@ public class ExploratoryServiceImpl implements
ExploratoryService {
@Inject
public ExploratoryServiceImpl(ProjectService projectService,
ExploratoryDAO exploratoryDAO, ComputationalDAO computationalDAO, GitCredsDAO
gitCredsDAO,
-
ImageExploratoryDao imageExploratoryDao,
@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService,
-
RequestBuilder requestBuilder, RequestId requestId, TagService tagService,
EndpointService endpointService, AuditService auditService,
-
SelfServiceApplicationConfiguration configuration) {
+ ImageExploratoryDAO imageExploratoryDao,
@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService,
+ RequestBuilder requestBuilder, RequestId
requestId, TagService tagService, EndpointService endpointService, AuditService
auditService,
+ SelfServiceApplicationConfiguration
configuration) {
this.projectService = projectService;
this.exploratoryDAO = exploratoryDAO;
this.computationalDAO = computationalDAO;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index 10e5126..4aae5b1 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -27,7 +27,7 @@ import com.epam.dlab.backendapi.annotation.ResourceName;
import com.epam.dlab.backendapi.annotation.User;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.dao.ExploratoryLibDAO;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.dto.ImageInfoRecord;
@@ -64,24 +64,24 @@ import static
com.epam.dlab.backendapi.domain.AuditResourceTypeEnum.IMAGE;
@Singleton
@Slf4j
public class ImageExploratoryServiceImpl implements ImageExploratoryService {
- private static final String IMAGE_EXISTS_MSG = "Image with name %s is
already exist in project %s";
- private static final String IMAGE_NOT_FOUND_MSG = "Image with name %s was
not found for user %s";
-
- @Inject
- private ExploratoryDAO exploratoryDAO;
- @Inject
- private ImageExploratoryDao imageExploratoryDao;
- @Inject
- private ExploratoryLibDAO libDAO;
- @Inject
- @Named(ServiceConsts.PROVISIONING_SERVICE_NAME)
- private RESTService provisioningService;
- @Inject
- private RequestBuilder requestBuilder;
- @Inject
- private EndpointService endpointService;
- @Inject
- private ProjectService projectService;
+ private static final String IMAGE_EXISTS_MSG = "Image with name %s is
already exist in project %s";
+ private static final String IMAGE_NOT_FOUND_MSG = "Image with name %s
was not found for user %s";
+
+ @Inject
+ private ExploratoryDAO exploratoryDAO;
+ @Inject
+ private ImageExploratoryDAO imageExploratoryDao;
+ @Inject
+ private ExploratoryLibDAO libDAO;
+ @Inject
+ @Named(ServiceConsts.PROVISIONING_SERVICE_NAME)
+ private RESTService provisioningService;
+ @Inject
+ private RequestBuilder requestBuilder;
+ @Inject
+ private EndpointService endpointService;
+ @Inject
+ private ProjectService projectService;
@Audit(action = CREATE, type = IMAGE)
@Override
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 9f3f05f..bce70c3 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
@@ -23,7 +23,7 @@ import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.ProjectDAO;
import com.epam.dlab.backendapi.dao.SettingsDAO;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.resources.dto.SparkStandaloneConfiguration;
import com.epam.dlab.backendapi.resources.dto.aws.AwsEmrConfiguration;
@@ -67,7 +67,7 @@ public class InfrastructureTemplateServiceImpl implements
InfrastructureTemplate
@Inject
private EndpointService endpointService;
@Inject
- private UserGroupDao userGroupDao;
+ private UserGroupDAO userGroupDao;
@Inject
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 2e80a8e..78cf324 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -30,7 +30,7 @@ import com.epam.dlab.backendapi.annotation.User;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.dao.ProjectDAO;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
import com.epam.dlab.backendapi.domain.BudgetDTO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
@@ -88,7 +88,7 @@ public class ProjectServiceImpl implements ProjectService {
private final ProjectDAO projectDAO;
private final ExploratoryService exploratoryService;
- private final UserGroupDao userGroupDao;
+ private final UserGroupDAO userGroupDao;
private final RESTService provisioningService;
private final RequestId requestId;
private final RequestBuilder requestBuilder;
@@ -99,7 +99,7 @@ public class ProjectServiceImpl implements ProjectService {
@Inject
public ProjectServiceImpl(ProjectDAO projectDAO, ExploratoryService
exploratoryService,
- UserGroupDao userGroupDao,
+ UserGroupDAO userGroupDao,
@Named(ServiceConsts.PROVISIONING_SERVICE_NAME) RESTService provisioningService,
RequestId requestId, RequestBuilder
requestBuilder, EndpointService endpointService,
ExploratoryDAO exploratoryDAO,
SelfServiceApplicationConfiguration configuration) {
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 5b5b7e5..32358f0 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
@@ -24,8 +24,8 @@ 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.dao.ProjectDAO;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.domain.AuditDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.dto.UserGroupDto;
@@ -66,16 +66,16 @@ public class UserGroupServiceImpl implements
UserGroupService {
private static final String ADMIN = "admin";
private static final String PROJECT_ADMIN = "projectAdmin";
- private final UserGroupDao userGroupDao;
- private final UserRoleDao userRoleDao;
+ private final UserGroupDAO userGroupDao;
+ private final UserRoleDAO userRoleDao;
private final ProjectDAO projectDAO;
private final ProjectService projectService;
private final AuditService auditService;
private final SelfServiceApplicationConfiguration configuration;
@Inject
- public UserGroupServiceImpl(UserGroupDao userGroupDao, UserRoleDao
userRoleDao, ProjectDAO projectDAO, ProjectService projectService, AuditService
auditService,
-
SelfServiceApplicationConfiguration configuration) {
+ public UserGroupServiceImpl(UserGroupDAO userGroupDao, UserRoleDAO
userRoleDao, ProjectDAO projectDAO, ProjectService projectService, AuditService
auditService,
+ SelfServiceApplicationConfiguration
configuration) {
this.userGroupDao = userGroupDao;
this.userRoleDao = userRoleDao;
this.projectDAO = projectDAO;
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/UserRoleServiceImplTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/UserRoleServiceImplTest.java
index 883630c..ef7ac34 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/UserRoleServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/UserRoleServiceImplTest.java
@@ -18,7 +18,7 @@
*/
package com.epam.dlab.backendapi.service;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.resources.TestBase;
import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
import com.epam.dlab.exceptions.ResourceNotFoundException;
@@ -39,15 +39,15 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class UserRoleServiceImplTest extends TestBase {
- private static final String ROLE_ID = "roleId";
- @Mock
- private UserRoleDao dao;
- @InjectMocks
- private UserRoleServiceImpl userRoleService;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+ private static final String ROLE_ID = "roleId";
+ @Mock
+ private UserRoleDAO dao;
+ @InjectMocks
+ private UserRoleServiceImpl userRoleService;
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
- @Test
+ @Test
public void createRole() {
userRoleService.createRole(getUserRole());
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BackupServiceImplTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BackupServiceImplTest.java
index 4a27bb5..e8916e8 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BackupServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/BackupServiceImplTest.java
@@ -20,7 +20,7 @@
package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.dao.BackupDao;
+import com.epam.dlab.backendapi.dao.BackupDAO;
import com.epam.dlab.backendapi.resources.dto.BackupInfoRecord;
import com.epam.dlab.dto.backup.EnvBackupDTO;
import com.epam.dlab.dto.backup.EnvBackupStatus;
@@ -41,7 +41,16 @@ import java.util.Optional;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.refEq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class BackupServiceImplTest {
@@ -51,7 +60,7 @@ public class BackupServiceImplTest {
@Mock
private RESTService provisioningService;
@Mock
- private BackupDao backupDao;
+ private BackupDAO backupDao;
@InjectMocks
private BackupServiceImpl backupService;
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
index 85d6015..ded7347 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
@@ -22,7 +22,7 @@ package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.dao.ExploratoryDAO;
import com.epam.dlab.backendapi.dao.ExploratoryLibDAO;
-import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
+import com.epam.dlab.backendapi.dao.ImageExploratoryDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.dto.ImageInfoRecord;
@@ -84,7 +84,7 @@ public class ImageExploratoryServiceImplTest {
@Mock
private ExploratoryDAO exploratoryDAO;
@Mock
- private ImageExploratoryDao imageExploratoryDao;
+ private ImageExploratoryDAO imageExploratoryDao;
@Mock
private ExploratoryLibDAO libDAO;
@Mock
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java
index 97079e3..769b0de 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InfrastructureTemplateServiceBaseTest.java
@@ -23,7 +23,7 @@ import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.conf.SelfServiceApplicationConfiguration;
import com.epam.dlab.backendapi.dao.ProjectDAO;
import com.epam.dlab.backendapi.dao.SettingsDAO;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.service.EndpointService;
@@ -71,7 +71,7 @@ public class InfrastructureTemplateServiceBaseTest {
@Mock
private EndpointService endpointService;
@Mock
- private UserGroupDao userGroupDao;
+ private UserGroupDAO userGroupDao;
@Mock
private SelfServiceApplicationConfiguration configuration;
diff --git
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java
index 0e4b3d2..3b3e901 100644
---
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java
+++
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java
@@ -20,8 +20,8 @@
package com.epam.dlab.backendapi.service.impl;
import com.epam.dlab.backendapi.dao.ProjectDAO;
-import com.epam.dlab.backendapi.dao.UserGroupDao;
-import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.dao.UserGroupDAO;
+import com.epam.dlab.backendapi.dao.UserRoleDAO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.resources.TestBase;
import com.epam.dlab.backendapi.resources.dto.UserGroupDto;
@@ -54,25 +54,25 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class UserGroupServiceImplTest extends TestBase {
- private static final String ROLE_ID = "Role id";
- private static final String USER = "test";
- private static final String GROUP = "admin";
- @Mock
- private UserRoleDao userRoleDao;
- @Mock
- private UserGroupDao userGroupDao;
- @Mock
- private ProjectDAO projectDAO;
- @InjectMocks
- private UserGroupServiceImpl userGroupService;
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- @Before
- public void setup() throws AuthenticationException {
- authSetup();
- }
+ private static final String ROLE_ID = "Role id";
+ private static final String USER = "test";
+ private static final String GROUP = "admin";
+ @Mock
+ private UserRoleDAO userRoleDao;
+ @Mock
+ private UserGroupDAO userGroupDao;
+ @Mock
+ private ProjectDAO projectDAO;
+ @InjectMocks
+ private UserGroupServiceImpl userGroupService;
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Before
+ public void setup() throws AuthenticationException {
+ authSetup();
+ }
@Test
public void createGroup() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
