Merge branch 'master' into EFRS-1348_remove_quartz

# Conflicts:
#	java/admin/src/main/resources/db/changelog/db.changelog-master.yaml
#	java/admin/src/test/java/com/exadel/frs/DbHelper.java
#	java/api/src/test/resources/db/changelog/db.changelog-master.yaml
#	java/common/src/main/java/com/exadel/frs/commonservice/scheduler/config/SpringQuartzSchedulerConfig.java
#	java/common/src/main/java/com/exadel/frs/commonservice/scheduler/job/StatisticsJob.java

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/FrsApplication.java

@@ -27,4 +27,4 @@ public class FrsApplication {
     public static void main(String[] args) {
         SpringApplication.run(FrsApplication.class, args);
     }
-}
+}

java/admin/src/main/java/com/exadel/frs/controller/AppController.java

@@ -16,10 +16,13 @@
 
 package com.exadel.frs.controller;
 
-import com.exadel.frs.commonservice.annotation.CollectStatistics;
 import com.exadel.frs.commonservice.enums.AppRole;
-import com.exadel.frs.commonservice.enums.StatisticsType;
-import com.exadel.frs.dto.ui.*;
+import com.exadel.frs.dto.AppCreateDto;
+import com.exadel.frs.dto.AppResponseDto;
+import com.exadel.frs.dto.AppUpdateDto;
+import com.exadel.frs.dto.UserInviteDto;
+import com.exadel.frs.dto.UserRoleResponseDto;
+import com.exadel.frs.dto.UserRoleUpdateDto;
 import com.exadel.frs.helpers.SecurityUtils;
 import com.exadel.frs.mapper.AppMapper;
 import com.exadel.frs.mapper.UserAppRoleMapper;

java/admin/src/main/java/com/exadel/frs/controller/AppStatusController.java

@@ -4,7 +4,7 @@
 import static com.exadel.frs.commonservice.enums.AppStatus.NOT_READY;
 import static com.exadel.frs.commonservice.enums.AppStatus.OK;
 import com.exadel.frs.commonservice.enums.AppStatus;
-import com.exadel.frs.dto.ui.AppStatusResponseDto;
+import com.exadel.frs.dto.AppStatusResponseDto;
 import io.swagger.annotations.ApiOperation;
 import java.sql.Connection;
 import java.sql.SQLException;

java/admin/src/main/java/com/exadel/frs/controller/ConfigController.java

@@ -1,7 +1,7 @@
 package com.exadel.frs.controller;
 
 import static com.exadel.frs.system.global.Constants.ADMIN;
-import com.exadel.frs.dto.ui.ConfigDto;
+import com.exadel.frs.dto.ConfigDto;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;

java/admin/src/main/java/com/exadel/frs/controller/ModelController.java

@@ -20,12 +20,12 @@
 import static com.exadel.frs.system.global.Constants.GUID_EXAMPLE;
 import static org.springframework.http.HttpStatus.CREATED;
 import com.exadel.frs.commonservice.entity.Model;
-import com.exadel.frs.commonservice.entity.ModelStatisticProjection;
+import com.exadel.frs.commonservice.projection.ModelStatisticProjection;
 import com.exadel.frs.commonservice.exception.IncorrectModelTypeException;
-import com.exadel.frs.dto.ui.ModelCloneDto;
-import com.exadel.frs.dto.ui.ModelCreateDto;
-import com.exadel.frs.dto.ui.ModelResponseDto;
-import com.exadel.frs.dto.ui.ModelUpdateDto;
+import com.exadel.frs.dto.ModelCloneDto;
+import com.exadel.frs.dto.ModelCreateDto;
+import com.exadel.frs.dto.ModelResponseDto;
+import com.exadel.frs.dto.ModelUpdateDto;
 import com.exadel.frs.helpers.SecurityUtils;
 import com.exadel.frs.mapper.MlModelMapper;
 import com.exadel.frs.service.ModelService;
@@ -96,20 +96,12 @@ public ModelResponseDto createModel(
             @RequestBody
             final ModelCreateDto modelCreateDto
     ) {
-        Model model;
-        switch (modelCreateDto.getType()) {
-            case DETECTION:
-                model = modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            case RECOGNITION:
-                model = modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            case VERIFY:
-                model = modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
-                break;
-            default:
-                throw new IncorrectModelTypeException(modelCreateDto.getType());
-        }
+        Model model = switch (modelCreateDto.getType()) {
+            case DETECTION -> modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            case RECOGNITION -> modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            case VERIFY -> modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
+            default -> throw new IncorrectModelTypeException(modelCreateDto.getType());
+        };
 
         return modelMapper.toResponseDto(model, appGuid);
     }

java/admin/src/main/java/com/exadel/frs/controller/UserController.java

@@ -26,16 +26,16 @@
 import com.exadel.frs.commonservice.enums.GlobalRole;
 import com.exadel.frs.commonservice.enums.Replacer;
 import com.exadel.frs.commonservice.exception.DemoNotAvailableException;
-import com.exadel.frs.dto.ui.ChangePasswordDto;
-import com.exadel.frs.dto.ui.ForgotPasswordDto;
-import com.exadel.frs.dto.ui.ResetPasswordDto;
-import com.exadel.frs.dto.ui.UserAutocompleteDto;
-import com.exadel.frs.dto.ui.UserCreateDto;
-import com.exadel.frs.dto.ui.UserDeleteDto;
-import com.exadel.frs.dto.ui.UserResponseDto;
-import com.exadel.frs.dto.ui.UserRoleResponseDto;
-import com.exadel.frs.dto.ui.UserRoleUpdateDto;
-import com.exadel.frs.dto.ui.UserUpdateDto;
+import com.exadel.frs.dto.ChangePasswordDto;
+import com.exadel.frs.dto.ForgotPasswordDto;
+import com.exadel.frs.dto.ResetPasswordDto;
+import com.exadel.frs.dto.UserAutocompleteDto;
+import com.exadel.frs.dto.UserCreateDto;
+import com.exadel.frs.dto.UserDeleteDto;
+import com.exadel.frs.dto.UserResponseDto;
+import com.exadel.frs.dto.UserRoleResponseDto;
+import com.exadel.frs.dto.UserRoleUpdateDto;
+import com.exadel.frs.dto.UserUpdateDto;
 import com.exadel.frs.exception.AccessDeniedException;
 import com.exadel.frs.exception.UserDoesNotExistException;
 import com.exadel.frs.helpers.SecurityUtils;

java/admin/src/main/java/com/exadel/frs/dto/AccessToken.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs.dto.ui;
+package com.exadel.frs.dto;
 
 import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;

java/admin/src/main/java/com/exadel/frs/dto/ui/AppCreateDto.java renamed to java/admin/src/main/java/com/exadel/frs/dto/AppCreateDto.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs.dto.ui;
+package com.exadel.frs.dto;
 
 import lombok.Data;
 
@@ -24,4 +24,4 @@ public class AppOwnerDto {
     private String userId;
     private String firstName;
     private String lastName;
-}
+}

java/admin/src/main/java/com/exadel/frs/dto/ui/AppOwnerDto.java renamed to java/admin/src/main/java/com/exadel/frs/dto/AppOwnerDto.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs.dto.ui;
+package com.exadel.frs.dto;
 
 import lombok.Data;
 
@@ -26,4 +26,4 @@ public class AppResponseDto {
     private String apiKey;
     private String role;
     private AppOwnerDto owner;
-}
+}