Skip to content

Commit

Permalink
Merge pull request #2 from s-chepurnov/Error-1
Browse files Browse the repository at this point in the history
Error 1
  • Loading branch information
funnyDevGirl authored Jul 31, 2024
2 parents 3e2feea + 4f7ebde commit 6abcc6a
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 14 deletions.
1 change: 1 addition & 0 deletions src/main/java/hexlet/code/AppApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ public static void main(String[] args) {
public Faker getFaker() {
return new Faker(Locale.US);
}

}
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/component/DataInitializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public class DataInitializer implements ApplicationRunner {
private final TaskStatusService taskStatusService;
private final LabelService labelService;


@Override
public void run(ApplicationArguments args) throws Exception {
var admin = new UserCreateDTO();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.springframework.security.web.util.matcher.OrRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;


@Configuration
@EnableWebSecurity
@AllArgsConstructor
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/dto/labels/LabelDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import lombok.Getter;
import lombok.Setter;


@Getter
@Setter
public class LabelDTO {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/dto/tasks/TaskDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.HashSet;
import java.util.Set;


@Getter
@Setter
public class TaskDTO {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/dto/tasks/TaskUpdateDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.openapitools.jackson.nullable.JsonNullable;
import java.util.Set;


@Getter
@Setter
public class TaskUpdateDTO {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import lombok.Getter;
import lombok.Setter;


@Getter
@Setter
public class TaskStatusDTO {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/hexlet/code/dto/users/UserUpdateDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.Setter;
import org.openapitools.jackson.nullable.JsonNullable;

@Getter
@Setter
public class UserUpdateDTO {

@Email
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/mapper/LabelMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.mapstruct.ReportingPolicy;
import org.mapstruct.MappingTarget;


@Mapper(
uses = {JsonNullableMapper.class, ReferenceMapper.class},
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/mapper/TaskMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Set;
import java.util.stream.Collectors;


@Mapper(
uses = {JsonNullableMapper.class, ReferenceMapper.class},
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/mapper/TaskStatusMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.mapstruct.MappingConstants;
import org.mapstruct.MappingTarget;


@Mapper(
uses = {JsonNullableMapper.class, ReferenceMapper.class},
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.springframework.security.provisioning.UserDetailsManager;
import org.springframework.stereotype.Service;


@Service
@AllArgsConstructor
public class CustomUserDetailsService implements UserDetailsManager {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/service/LabelService.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.springframework.stereotype.Service;
import java.util.List;


@Slf4j
@Service
@AllArgsConstructor
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hexlet/code/utils/UserUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public class UserUtils {

private final UserRepository userRepository;


public User getCurrentUser() {
var authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || !authentication.isAuthenticated()) {
Expand Down

0 comments on commit 6abcc6a

Please sign in to comment.