lint

Author: fey

build.gradle.kts

@@ -74,7 +74,7 @@ spotless {
     java {
         importOrder()
         removeUnusedImports()
-        eclipse().sortMembersEnabled(true)
+        eclipse()
         formatAnnotations()
         leadingTabsToSpaces(4)
     }

src/main/java/io/hexlet/project_devops_deploy/component/DataInitializer.java

@@ -25,8 +25,7 @@ public void run(ApplicationArguments args) {
             return;
         }
 
-        IntStream.range(0, BULLETIN_SEED_COUNT)
-                .mapToObj(i -> modelGenerator.generateBulletin())
+        IntStream.range(0, BULLETIN_SEED_COUNT).mapToObj(i -> modelGenerator.generateBulletin())
                 .forEach(repository::save);
     }
 }

src/main/java/io/hexlet/project_devops_deploy/controller/BulletinController.java

@@ -21,12 +21,8 @@
 @RequestMapping("/api")
 public class BulletinController {
 
-    private BulletinService service;
-
     @Autowired
-    public void setService(BulletinService service) {
-        this.service = service;
-    }
+    private BulletinService service;
 
     @PostMapping("/bulletins")
     @ResponseStatus(HttpStatus.CREATED)
@@ -49,7 +45,6 @@ public BulletinDto update(@PathVariable Long id, @Valid @RequestBody BulletinReq
         return service.update(id, request);
     }
 
-
     @DeleteMapping("/bulletins/{id}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void delete(@PathVariable Long id) {

src/main/java/io/hexlet/project_devops_deploy/exception/ResourceNotFoundException.java

@@ -1,6 +1,5 @@
 package io.hexlet.project_devops_deploy.exception;
 
-
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 

src/main/java/io/hexlet/project_devops_deploy/model/Bulletin.java

@@ -1,5 +1,6 @@
 package io.hexlet.project_devops_deploy.model;
 
+import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
@@ -9,7 +10,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import io.hexlet.project_devops_deploy.model.bulletin.BulletinState;
 import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/hexlet/project_devops_deploy/service/BulletinService.java

@@ -3,8 +3,8 @@
 import io.hexlet.project_devops_deploy.dto.BulletinDto;
 import io.hexlet.project_devops_deploy.dto.BulletinRequest;
 import io.hexlet.project_devops_deploy.exception.ResourceNotFoundException;
-import io.hexlet.project_devops_deploy.model.Bulletin;
 import io.hexlet.project_devops_deploy.mapper.BulletinMapper;
+import io.hexlet.project_devops_deploy.model.Bulletin;
 import io.hexlet.project_devops_deploy.repository.BulletinRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -14,24 +14,17 @@
 @Transactional
 public class BulletinService {
 
+    @Autowired
     private final BulletinRepository repository;
-    private final BulletinMapper mapper;
 
-    public BulletinService(BulletinRepository repository, BulletinMapper mapper) {
-        this.repository = repository;
-        this.mapper = mapper;
-    }
+    @Autowired
+    private final BulletinMapper mapper;
 
     public BulletinDto create(BulletinRequest request) {
         Bulletin bulletin = mapper.toEntity(request);
         return mapper.toDto(repository.save(bulletin));
     }
 
-    public void delete(Long id) {
-        Bulletin bulletin = getBulletin(id);
-        repository.delete(bulletin);
-    }
-
     @Transactional(readOnly = true)
     public List<BulletinDto> findAll() {
         return repository.findAll().stream().map(mapper::toDto).toList();
@@ -43,12 +36,18 @@ public BulletinDto findById(Long id) {
     }
 
     private Bulletin getBulletin(Long id) {
-        return repository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Bulletin has not found"));
+        return repository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Bulletin %d not found".formatted(id)));
     }
 
     public BulletinDto update(Long id, BulletinRequest request) {
         Bulletin bulletin = getBulletin(id);
         mapper.updateEntity(request, bulletin);
         return mapper.toDto(repository.save(bulletin));
     }
+
+    public void delete(Long id) {
+        Bulletin bulletin = getBulletin(id);
+        repository.delete(bulletin);
+    }
 }

src/main/java/io/hexlet/project_devops_deploy/util/ModelGenerator.java

@@ -27,14 +27,11 @@ public Bulletin generateBulletin() {
 
     @PostConstruct
     private void init() {
-        bulletinModel = Instancio.of(Bulletin.class)
-                .ignore(Select.field(Bulletin::getId))
-                .ignore(Select.field(Bulletin::getCreatedAt))
-                .ignore(Select.field(Bulletin::getUpdatedAt))
+        bulletinModel = Instancio.of(Bulletin.class).ignore(Select.field(Bulletin::getId))
+                .ignore(Select.field(Bulletin::getCreatedAt)).ignore(Select.field(Bulletin::getUpdatedAt))
                 .supply(Select.field(Bulletin::getTitle), () -> faker.book().title())
                 .supply(Select.field(Bulletin::getDescription), () -> faker.lorem().paragraph(3))
                 .supply(Select.field(Bulletin::getState), () -> faker.options().option(BulletinState.values()))
-                .supply(Select.field(Bulletin::getContact), () -> faker.phoneNumber().phoneNumber())
-                .toModel();
+                .supply(Select.field(Bulletin::getContact), () -> faker.phoneNumber().phoneNumber()).toModel();
     }
 }

src/test/java/io/hexlet/project_devops_deploy/controller/BulletinControllerTest.java

@@ -40,7 +40,6 @@ class BulletinControllerTest {
     @Autowired
     private BulletinRepository bulletinRepository;
 
-
     @BeforeEach
     void setup() {
         bulletinRepository.deleteAll();