Skip to content

Commit 1541fac

Browse files
committed
Merge branch '51-create-spotless-plugin' into 53-github-actions-for-running-spotless-and-tests
2 parents 721cc5d + bc548c9 commit 1541fac

36 files changed

+705
-579
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ out/
4040
*.pem
4141

4242
postgres-dev-data
43+
.DS_Store

eclipse-formatter.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<profiles version="12">
3+
<profile kind="CodeFormatterProfile" name="Custom" version="12">
4+
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
5+
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
6+
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
7+
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="true"/>
8+
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
9+
</profile>
10+
</profiles>

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,26 @@
9898
<artifactId>maven-surefire-plugin</artifactId>
9999
<version>3.5.2</version>
100100
</plugin>
101+
<plugin>
102+
<groupId>com.diffplug.spotless</groupId>
103+
<artifactId>spotless-maven-plugin</artifactId>
104+
<version>2.44.0</version>
105+
<executions>
106+
<execution>
107+
<goals>
108+
<goal>check</goal>
109+
<goal>apply</goal>
110+
</goals>
111+
</execution>
112+
</executions>
113+
<configuration>
114+
<java>
115+
<eclipse>
116+
<file>${basedir}/eclipse-formatter.xml</file>
117+
</eclipse>
118+
</java>
119+
</configuration>
120+
</plugin>
101121
</plugins>
102122
</build>
103123
</project>

src/.DS_Store

-6 KB
Binary file not shown.

src/main/.DS_Store

-6 KB
Binary file not shown.

src/main/java/com/es/boardGameTraining/BoardGameTrainingApplication.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
@SpringBootApplication
99
public class BoardGameTrainingApplication {
1010

11-
public static void main(String[] args) {
12-
SpringApplication.run(BoardGameTrainingApplication.class, args);
13-
}
14-
15-
@Bean // More explicit creation than @Autowired
16-
public RestTemplate restTemplate() {
17-
return new RestTemplate();
18-
}
11+
public static void main(String[] args) {
12+
SpringApplication.run(BoardGameTrainingApplication.class, args);
13+
}
1914

15+
@Bean // More explicit creation than @Autowired
16+
public RestTemplate restTemplate() {
17+
return new RestTemplate();
18+
}
2019
}

src/main/java/com/es/boardGameTraining/ServletInitializer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
public class ServletInitializer extends SpringBootServletInitializer {
77

8-
@Override
9-
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
10-
return application.sources(BoardGameTrainingApplication.class);
11-
}
12-
8+
@Override
9+
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
10+
return application.sources(BoardGameTrainingApplication.class);
11+
}
1312
}

src/main/java/com/es/boardGameTraining/controller/GameController.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
import com.es.boardGameTraining.dto.GameBggDTO;
44
import com.es.boardGameTraining.dto.GameDTO;
5+
import com.es.boardGameTraining.service.GameService;
6+
import java.util.List;
57
import org.springframework.beans.factory.annotation.Autowired;
68
import org.springframework.http.HttpStatus;
79
import org.springframework.http.ResponseEntity;
810
import org.springframework.web.bind.annotation.*;
911

10-
import com.es.boardGameTraining.service.GameService;
11-
12-
import java.util.List;
13-
1412
@RestController
1513
@RequestMapping("/games")
1614
public class GameController {
@@ -27,7 +25,6 @@ public ResponseEntity<List<GameDTO>> getGamesByParameter(@PathVariable String pa
2725
return new ResponseEntity<>(gameService.getGamesByParameter(parameter), HttpStatus.OK);
2826
}
2927

30-
3128
@GetMapping("/search/{name}")
3229
public ResponseEntity<List<GameBggDTO>> searchGames(@PathVariable String name) {
3330
return new ResponseEntity<>(gameService.searchGames(name), HttpStatus.OK);

src/main/java/com/es/boardGameTraining/controller/PlayController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import com.es.boardGameTraining.dto.PlayCreateDTO;
44
import com.es.boardGameTraining.dto.PlayDTO;
55
import com.es.boardGameTraining.service.PlayService;
6+
import java.util.List;
67
import org.springframework.beans.factory.annotation.Autowired;
78
import org.springframework.http.HttpStatus;
89
import org.springframework.http.ResponseEntity;
910
import org.springframework.web.bind.annotation.*;
1011

11-
import java.util.List;
12-
1312
@RestController
1413
@RequestMapping("/plays")
1514
public class PlayController {
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.es.boardGameTraining.controller;
2+
3+
import com.es.boardGameTraining.dto.PlayerCreateDTO;
4+
import com.es.boardGameTraining.dto.PlayerDTO;
5+
import com.es.boardGameTraining.service.PlayerService;
6+
import java.util.List;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.http.HttpStatus;
9+
import org.springframework.http.ResponseEntity;
10+
import org.springframework.web.bind.annotation.*;
11+
12+
@RestController
13+
@RequestMapping("/player")
14+
public class PlayerController {
15+
16+
@Autowired
17+
private PlayerService playerService;
18+
19+
@GetMapping("/")
20+
public ResponseEntity<List<PlayerDTO>> getAllPlayers() {
21+
return new ResponseEntity<>(playerService.getAllPlayers(), HttpStatus.OK);
22+
}
23+
24+
@GetMapping("/{nickname}")
25+
public ResponseEntity<List<PlayerDTO>> getPlayerByParameter(@PathVariable String nickname) {
26+
return new ResponseEntity<>(playerService.getPlayersByParameter(nickname), HttpStatus.OK);
27+
}
28+
29+
@PostMapping("/")
30+
public ResponseEntity<PlayerDTO> createPlayer(@RequestBody PlayerCreateDTO playerDTO) {
31+
return new ResponseEntity<>(playerService.createPlayer(playerDTO), HttpStatus.CREATED);
32+
}
33+
}

0 commit comments

Comments
 (0)