Skip to content

Commit a6d78f9

Browse files
ivangfrivangfr
committed
Remove custom importOrder from Spotless and [*.java] from .editorconfig
- Remove <importOrder> from pom.xml so IntelliJ google-java-format plugin matches Spotless on import ordering - Remove [*.java] from .editorconfig to avoid overriding the google-java-format plugin in the IDE - Run spotless:apply to reformat all Java sources with default import sorting
1 parent e0772f5 commit a6d78f9

20 files changed

Lines changed: 35 additions & 75 deletions

File tree

‎.editorconfig‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ end_of_line = lf
66
trim_trailing_whitespace = true
77
insert_final_newline = true
88

9-
[*.java]
10-
indent_style = space
11-
indent_size = 2
12-
max_line_length = 100
13-
149
[*.{yaml,yml}]
1510
indent_style = space
1611
indent_size = 2

‎movies-api/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@
125125
<version>${google-java-format.version}</version>
126126
<style>GOOGLE</style>
127127
</googleJavaFormat>
128-
<importOrder>
129-
<order>java,jakarta,org,com</order>
130-
</importOrder>
131128
<removeUnusedImports />
132129
<forbidWildcardImports />
133130
<formatAnnotations />

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/config/CorsConfig.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ivanfranchin.moviesapi.config;
22

33
import java.util.List;
4-
54
import org.springframework.beans.factory.annotation.Value;
65
import org.springframework.context.annotation.Bean;
76
import org.springframework.context.annotation.Configuration;

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/config/ErrorAttributesConfig.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ivanfranchin.moviesapi.config;
22

33
import java.util.Map;
4-
54
import org.springframework.boot.web.error.ErrorAttributeOptions;
65
import org.springframework.boot.web.error.ErrorAttributeOptions.Include;
76
import org.springframework.boot.webmvc.error.DefaultErrorAttributes;

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/config/SwaggerConfig.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.ivanfranchin.moviesapi.config;
22

3+
import io.swagger.v3.oas.models.Components;
4+
import io.swagger.v3.oas.models.OpenAPI;
5+
import io.swagger.v3.oas.models.info.Info;
36
import org.springdoc.core.models.GroupedOpenApi;
47
import org.springframework.beans.factory.annotation.Value;
58
import org.springframework.context.annotation.Bean;
69
import org.springframework.context.annotation.Configuration;
710

8-
import io.swagger.v3.oas.models.Components;
9-
import io.swagger.v3.oas.models.OpenAPI;
10-
import io.swagger.v3.oas.models.info.Info;
11-
1211
@Configuration
1312
public class SwaggerConfig {
1413

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/movie/MovieRepository.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ivanfranchin.moviesapi.movie;
22

3-
import org.springframework.data.jpa.repository.JpaRepository;
4-
53
import com.ivanfranchin.moviesapi.movie.model.Movie;
4+
import org.springframework.data.jpa.repository.JpaRepository;
65

76
public interface MovieRepository extends JpaRepository<Movie, String> {}

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/movie/MovieService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.ivanfranchin.moviesapi.movie;
22

3-
import java.util.List;
4-
53
import com.ivanfranchin.moviesapi.movie.model.Movie;
4+
import java.util.List;
65

76
public interface MovieService {
87

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/movie/MovieServiceImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.ivanfranchin.moviesapi.movie;
22

3-
import java.util.List;
4-
5-
import org.springframework.stereotype.Service;
6-
73
import com.ivanfranchin.moviesapi.movie.exception.MovieNotFoundException;
84
import com.ivanfranchin.moviesapi.movie.model.Movie;
9-
5+
import java.util.List;
106
import lombok.RequiredArgsConstructor;
7+
import org.springframework.stereotype.Service;
118

129
@RequiredArgsConstructor
1310
@Service

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/movie/MoviesController.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.ivanfranchin.moviesapi.movie;
22

3-
import java.util.List;
4-
3+
import com.ivanfranchin.moviesapi.movie.dto.AddMovieRequest;
4+
import com.ivanfranchin.moviesapi.movie.dto.MovieResponse;
5+
import com.ivanfranchin.moviesapi.movie.model.Movie;
56
import jakarta.validation.Valid;
6-
7+
import java.util.List;
8+
import lombok.RequiredArgsConstructor;
79
import org.springframework.http.HttpStatus;
810
import org.springframework.web.bind.annotation.DeleteMapping;
911
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,12 +16,6 @@
1416
import org.springframework.web.bind.annotation.ResponseStatus;
1517
import org.springframework.web.bind.annotation.RestController;
1618

17-
import com.ivanfranchin.moviesapi.movie.dto.AddMovieRequest;
18-
import com.ivanfranchin.moviesapi.movie.dto.MovieResponse;
19-
import com.ivanfranchin.moviesapi.movie.model.Movie;
20-
21-
import lombok.RequiredArgsConstructor;
22-
2319
@RequiredArgsConstructor
2420
@RestController
2521
@RequestMapping("/api/movies")

‎movies-api/src/main/java/com/ivanfranchin/moviesapi/movie/dto/AddMovieRequest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.ivanfranchin.moviesapi.movie.dto;
22

3+
import io.swagger.v3.oas.annotations.media.Schema;
34
import jakarta.validation.constraints.NotBlank;
45
import jakarta.validation.constraints.Positive;
56

6-
import io.swagger.v3.oas.annotations.media.Schema;
7-
87
public record AddMovieRequest(
98
@Schema(example = "tt0120804") @NotBlank String imdbId,
109
@Schema(example = "Resident Evil") @NotBlank String title,

0 commit comments

Comments
 (0)