Skip to content

Commit 6311724

Browse files
EFRS-1350: Refactored code to fit Java 17
1 parent 3c94c04 commit 6311724

File tree

134 files changed

+257
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+257
-325
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ public class FrsApplication {
2727
public static void main(String[] args) {
2828
SpringApplication.run(FrsApplication.class, args);
2929
}
30-
}
30+
}

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,12 @@ public ModelResponseDto createModel(
9696
@RequestBody
9797
final ModelCreateDto modelCreateDto
9898
) {
99-
Model model;
100-
switch (modelCreateDto.getType()) {
101-
case DETECTION:
102-
model = modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
103-
break;
104-
case RECOGNITION:
105-
model = modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
106-
break;
107-
case VERIFY:
108-
model = modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
109-
break;
110-
default:
111-
throw new IncorrectModelTypeException(modelCreateDto.getType());
112-
}
99+
Model model = switch (modelCreateDto.getType()) {
100+
case DETECTION -> modelService.createDetectionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
101+
case RECOGNITION -> modelService.createRecognitionModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
102+
case VERIFY -> modelService.createVerificationModel(modelCreateDto, appGuid, SecurityUtils.getPrincipalId());
103+
default -> throw new IncorrectModelTypeException(modelCreateDto.getType());
104+
};
113105

114106
return modelMapper.toResponseDto(model, appGuid);
115107
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public class AppOwnerDto {
2424
private String userId;
2525
private String firstName;
2626
private String lastName;
27-
}
27+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ public class AppResponseDto {
2626
private String apiKey;
2727
private String role;
2828
private AppOwnerDto owner;
29-
}
29+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ public class ModelUpdateDto {
3535
@Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
3636
@Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
3737
private String name;
38-
}
38+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ public class UserAutocompleteDto {
3131
private String query;
3232
private int length;
3333
private List<UserResponseDto> results;
34-
}
34+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ public class UserInviteDto {
2929

3030
private String role;
3131
private String userEmail;
32-
}
32+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ public class UserResponseDto {
2525
private String email;
2626
private String firstName;
2727
private String lastName;
28-
}
28+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ public class UserRoleResponseDto {
2626
private String lastName;
2727
private String role;
2828
private String email;
29-
}
29+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ public class UserRoleUpdateDto {
3636
@NotBlank(message = "Role cannot be empty")
3737
@ValidEnum(message = "Global role '${validatedValue}' doesn't exist!", targetClassType = GlobalRole.class)
3838
private String role;
39-
}
39+
}

0 commit comments

Comments
 (0)