From a4e1719d4e604a6f3e4521f80b1634ce68db817c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Sk=C3=A1cel=C3=ADk?= <xskacel@fi.muni.cz>
Date: Mon, 20 Mar 2023 09:46:16 +0100
Subject: [PATCH] Added code formater while building and .gitlab-ci
---
.gitlab-ci.yml | 11 ++++
.../muni/fi/pa165/core/CoreApplication.java | 7 +--
.../muni/fi/pa165/core/DataInitializer.java | 28 ++++-----
.../fi/pa165/core/common/DomainMapper.java | 24 ++++----
.../fi/pa165/core/common/DomainObject.java | 3 +-
.../fi/pa165/core/common/DomainService.java | 29 +++++-----
.../java/cz/muni/fi/pa165/core/user/User.java | 15 +++--
.../fi/pa165/core/user/UserController.java | 58 +++++++++----------
.../muni/fi/pa165/core/user/UserMapper.java | 3 +-
.../fi/pa165/core/user/UserRepository.java | 4 +-
.../muni/fi/pa165/core/user/UserService.java | 38 ++++++------
.../cz/muni/fi/pa165/core/user/UserType.java | 6 +-
.../fi/pa165/core/CoreApplicationTest.java | 6 +-
.../cz/muni/fi/pa165/microservice3/App.java | 7 +--
.../muni/fi/pa165/microservice3/AppTest.java | 5 +-
.../cz/muni/fi/pa165/microservice4/App.java | 7 +--
.../muni/fi/pa165/microservice4/AppTest.java | 7 +--
.../model/dto/common/DomainObjectDto.java | 4 +-
.../pa165/model/dto/user/UserCreateDto.java | 12 ++--
.../muni/fi/pa165/model/dto/user/UserDto.java | 10 ++--
pom.xml | 23 +++++++-
.../statistics/StatisticsApplication.java | 7 +--
.../statistics/StatisticsApplicationTest.java | 8 +--
23 files changed, 166 insertions(+), 156 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..b44df56
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+# Based on https://gitlab.fi.muni.cz/unix/examples/ci-examples/-/blob/java-maven/.gitlab-ci.yml
+image: maven:3-openjdk-17
+
+build:
+ tags:
+ - shared-fi
+ script:
+ - mvn -ntp clean package
+
+
+
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/CoreApplication.java b/core/src/main/java/cz/muni/fi/pa165/core/CoreApplication.java
index f76cdbe..1e1b34a 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/CoreApplication.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/CoreApplication.java
@@ -6,8 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class CoreApplication {
- public static void main(String[] args) {
- SpringApplication.run(CoreApplication.class, args);
- }
-
+ public static void main(String[] args) {
+ SpringApplication.run(CoreApplication.class, args);
+ }
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java b/core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
index 8a13146..2f20873 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/DataInitializer.java
@@ -11,19 +11,19 @@ import org.springframework.stereotype.Component;
@RequiredArgsConstructor
@Component
public class DataInitializer implements ApplicationRunner {
- private final UserService userService;
+ private final UserService userService;
- @Override
- public void run(ApplicationArguments args) throws Exception {
- User user = User.builder()
- .email("test@email.com")
- .firstName("John")
- .lastName("Doe")
- .username("johnD")
- .password("password")
- .userType(UserType.ADMIN)
- .build();
- userService.create(user);
-
- }
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ User user =
+ User.builder()
+ .email("test@email.com")
+ .firstName("John")
+ .lastName("Doe")
+ .username("johnD")
+ .password("password")
+ .userType(UserType.ADMIN)
+ .build();
+ userService.create(user);
+ }
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainMapper.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainMapper.java
index 099ae1a..a770ec9 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainMapper.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainMapper.java
@@ -6,19 +6,19 @@ import java.util.List;
public interface DomainMapper<T extends DomainObject, S extends DomainObjectDto> {
- T fromDto(S dto);
+ T fromDto(S dto);
- S toDto(T entity);
+ S toDto(T entity);
- List<S> toDtoList(List<T> entities);
+ List<S> toDtoList(List<T> entities);
- /*
- @Mappings({
- @Mapping(target = "total", expression = "java(source.getTotalElements())"),
- @Mapping(target = "page", expression = "java(source.getNumber())"),
- @Mapping(target = "pageSize", expression = "java(source.getSize())"),
- @Mapping(target = "items", expression = "java(toDtoList(source.getContent()))")
- })
- Result<S> toResult(Page<T> source);
- */
+ /*
+ @Mappings({
+ @Mapping(target = "total", expression = "java(source.getTotalElements())"),
+ @Mapping(target = "page", expression = "java(source.getNumber())"),
+ @Mapping(target = "pageSize", expression = "java(source.getSize())"),
+ @Mapping(target = "items", expression = "java(toDtoList(source.getContent()))")
+ })
+ Result<S> toResult(Page<T> source);
+ */
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
index f49c035..c2d5200 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
@@ -12,6 +12,5 @@ import java.util.UUID;
@MappedSuperclass
public abstract class DomainObject {
- @Id
- private String id = UUID.randomUUID().toString();
+ @Id private String id = UUID.randomUUID().toString();
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
index 2d09402..5e2b621 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
@@ -8,23 +8,22 @@ import org.springframework.transaction.annotation.Transactional;
public abstract class DomainService<T extends DomainObject> {
- public static final int DEFAULT_PAGE_SIZE = 10;
+ public static final int DEFAULT_PAGE_SIZE = 10;
- public abstract JpaRepository<T, String> getRepository();
+ public abstract JpaRepository<T, String> getRepository();
- @Transactional
- public T create(T entity) {
- return getRepository().save(entity);
- }
+ @Transactional
+ public T create(T entity) {
+ return getRepository().save(entity);
+ }
- @Transactional(readOnly = true)
- public Page<T> findAll(Pageable pageable) {
- return getRepository().findAll(pageable);
- }
+ @Transactional(readOnly = true)
+ public Page<T> findAll(Pageable pageable) {
+ return getRepository().findAll(pageable);
+ }
- @Transactional(readOnly = true)
- public Page<T> findAll(int page) {
- return getRepository().findAll(PageRequest.of(page, DEFAULT_PAGE_SIZE));
- }
+ @Transactional(readOnly = true)
+ public Page<T> findAll(int page) {
+ return getRepository().findAll(PageRequest.of(page, DEFAULT_PAGE_SIZE));
+ }
}
-
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/User.java b/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
index 6ae1b42..74ff261 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/User.java
@@ -20,17 +20,16 @@ import lombok.Setter;
@Table(name = "domain_user")
public class User extends DomainObject {
- private String username;
+ private String username;
- @Enumerated(EnumType.STRING)
- private UserType userType;
+ @Enumerated(EnumType.STRING)
+ private UserType userType;
- private String password;
+ private String password;
- private String email;
+ private String email;
- private String firstName;
-
- private String lastName;
+ private String firstName;
+ private String lastName;
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java
index b143a7c..ca8bbd0 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserController.java
@@ -16,33 +16,33 @@ import java.util.List;
@RequestMapping("/users")
public class UserController {
- private final UserService service;
-
- private final UserMapper mapper;
-
- @Autowired
- public UserController(UserService service, UserMapper mapper) {
- this.service = service;
- this.mapper = mapper;
- }
-
- @GetMapping
- public List<UserDto> findAll() {
- return service.findAll().stream().map(mapper::toDto).toList();
- }
-
- @GetMapping("/{id}")
- public UserDto find(@PathVariable String id) {
- return mapper.toDto(service.find(id));
- }
-
- @PostMapping
- public UserDto create(@RequestBody UserCreateDto dto) {
- return mapper.toDto(service.create(mapper.fromCreateDto(dto)));
- }
-
- // @GetMapping
- // public Result<UserDto> findAll(@RequestParam int page) {
- // return mapper.toResult(service.findAll(page));
- // }
+ private final UserService service;
+
+ private final UserMapper mapper;
+
+ @Autowired
+ public UserController(UserService service, UserMapper mapper) {
+ this.service = service;
+ this.mapper = mapper;
+ }
+
+ @GetMapping
+ public List<UserDto> findAll() {
+ return service.findAll().stream().map(mapper::toDto).toList();
+ }
+
+ @GetMapping("/{id}")
+ public UserDto find(@PathVariable String id) {
+ return mapper.toDto(service.find(id));
+ }
+
+ @PostMapping
+ public UserDto create(@RequestBody UserCreateDto dto) {
+ return mapper.toDto(service.create(mapper.fromCreateDto(dto)));
+ }
+
+ // @GetMapping
+ // public Result<UserDto> findAll(@RequestParam int page) {
+ // return mapper.toResult(service.findAll(page));
+ // }
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserMapper.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserMapper.java
index ce1a629..32642e7 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserMapper.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserMapper.java
@@ -8,6 +8,5 @@ import org.mapstruct.Mapper;
@Mapper
public interface UserMapper extends DomainMapper<User, UserDto> {
- User fromCreateDto(UserCreateDto dto);
+ User fromCreateDto(UserCreateDto dto);
}
-
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserRepository.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserRepository.java
index 58f12b1..a3c8c1e 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserRepository.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserRepository.java
@@ -4,6 +4,4 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
-public interface UserRepository extends JpaRepository<User, String> {
-}
-
+public interface UserRepository extends JpaRepository<User, String> {}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
index 1411527..c1ff635 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
@@ -12,24 +12,22 @@ import java.util.List;
@Service
public class UserService extends DomainService<User> {
- @Getter
- private final UserRepository repository;
-
- @Autowired
- public UserService(UserRepository repository) {
- this.repository = repository;
- }
-
- @Transactional(readOnly = true)
- public User find(String id) {
- return repository.findById(id)
- .orElseThrow(() -> new EntityNotFoundException("User '" + id + "' not found."));
- }
-
- @Transactional(readOnly = true)
- public List<User> findAll() {
- return repository.findAll();
- }
-
+ @Getter private final UserRepository repository;
+
+ @Autowired
+ public UserService(UserRepository repository) {
+ this.repository = repository;
+ }
+
+ @Transactional(readOnly = true)
+ public User find(String id) {
+ return repository
+ .findById(id)
+ .orElseThrow(() -> new EntityNotFoundException("User '" + id + "' not found."));
+ }
+
+ @Transactional(readOnly = true)
+ public List<User> findAll() {
+ return repository.findAll();
+ }
}
-
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserType.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserType.java
index 3208d51..8f4a527 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserType.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserType.java
@@ -1,7 +1,7 @@
package cz.muni.fi.pa165.core.user;
public enum UserType {
- NORMAL,
- EMPLOYEE,
- ADMIN
+ NORMAL,
+ EMPLOYEE,
+ ADMIN
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/CoreApplicationTest.java b/core/src/test/java/cz/muni/fi/pa165/core/CoreApplicationTest.java
index 9b7b7c0..94a9c35 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/CoreApplicationTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/CoreApplicationTest.java
@@ -6,8 +6,6 @@ import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class CoreApplicationTest {
- @Test
- void contextLoads() {
- }
-
+ @Test
+ void contextLoads() {}
}
diff --git a/microservice3/src/main/java/cz/muni/fi/pa165/microservice3/App.java b/microservice3/src/main/java/cz/muni/fi/pa165/microservice3/App.java
index 8b3f7ae..94bbd84 100644
--- a/microservice3/src/main/java/cz/muni/fi/pa165/microservice3/App.java
+++ b/microservice3/src/main/java/cz/muni/fi/pa165/microservice3/App.java
@@ -6,8 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class App {
- public static void main(String[] args) {
- SpringApplication.run(App.class, args);
- }
-
+ public static void main(String[] args) {
+ SpringApplication.run(App.class, args);
+ }
}
diff --git a/microservice3/src/test/java/cz/muni/fi/pa165/microservice3/AppTest.java b/microservice3/src/test/java/cz/muni/fi/pa165/microservice3/AppTest.java
index 927c9db..53dd3bc 100644
--- a/microservice3/src/test/java/cz/muni/fi/pa165/microservice3/AppTest.java
+++ b/microservice3/src/test/java/cz/muni/fi/pa165/microservice3/AppTest.java
@@ -5,7 +5,6 @@ import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
public class AppTest {
- @Test
- void contextLoads() {
- }
+ @Test
+ void contextLoads() {}
}
diff --git a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java
index 9044aa6..fbce892 100644
--- a/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java
+++ b/microservice4/src/main/java/cz/muni/fi/pa165/microservice4/App.java
@@ -6,8 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class App {
- public static void main(String[] args) {
- SpringApplication.run(App.class, args);
- }
-
+ public static void main(String[] args) {
+ SpringApplication.run(App.class, args);
+ }
}
diff --git a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java b/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java
index 3a9a025..0f0e15a 100644
--- a/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java
+++ b/microservice4/src/test/java/cz/muni/fi/pa165/microservice4/AppTest.java
@@ -5,7 +5,6 @@ import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
public class AppTest {
- @Test
- void contextLoads() {
- }
-}
\ No newline at end of file
+ @Test
+ void contextLoads() {}
+}
diff --git a/model/src/main/java/cz/muni/fi/pa165/model/dto/common/DomainObjectDto.java b/model/src/main/java/cz/muni/fi/pa165/model/dto/common/DomainObjectDto.java
index f99c4d2..f1f03d1 100644
--- a/model/src/main/java/cz/muni/fi/pa165/model/dto/common/DomainObjectDto.java
+++ b/model/src/main/java/cz/muni/fi/pa165/model/dto/common/DomainObjectDto.java
@@ -7,5 +7,5 @@ import lombok.Setter;
@Setter
public abstract class DomainObjectDto {
- private String id;
-}
\ No newline at end of file
+ private String id;
+}
diff --git a/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserCreateDto.java b/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserCreateDto.java
index 8221a48..94b70d5 100644
--- a/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserCreateDto.java
+++ b/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserCreateDto.java
@@ -8,15 +8,13 @@ import lombok.Setter;
@Setter
public class UserCreateDto extends DomainObjectDto {
- private String username;
+ private String username;
- private String password;
+ private String password;
- private String email;
+ private String email;
- private String firstName;
-
- private String lastName;
+ private String firstName;
+ private String lastName;
}
-
diff --git a/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserDto.java b/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserDto.java
index ede86ac..f6e5ac7 100644
--- a/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserDto.java
+++ b/model/src/main/java/cz/muni/fi/pa165/model/dto/user/UserDto.java
@@ -8,13 +8,11 @@ import lombok.Setter;
@Setter
public class UserDto extends DomainObjectDto {
- private String username;
+ private String username;
- private String email;
-
- private String firstName;
-
- private String lastName;
+ private String email;
+ private String firstName;
+ private String lastName;
}
diff --git a/pom.xml b/pom.xml
index 46c7101..c373bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,28 @@
</compilerArgs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>googleformatter-maven-plugin</artifactId>
+ <version>1.7.3</version>
+ <executions>
+ <execution>
+ <id>reformat-sources</id>
+ <configuration>
+ <includeStale>false</includeStale>
+ <style>GOOGLE</style>
+ <filterModified>false</filterModified>
+ <skip>false</skip>
+ <fixImports>false</fixImports>
+ <maxLineLength>100</maxLineLength>
+ </configuration>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -97,5 +119,4 @@
</plugins>
</pluginManagement>
</build>
-
</project>
diff --git a/statistics/src/main/java/cz/muni/fi/pa165/statistics/StatisticsApplication.java b/statistics/src/main/java/cz/muni/fi/pa165/statistics/StatisticsApplication.java
index f73b192..4e7ca05 100644
--- a/statistics/src/main/java/cz/muni/fi/pa165/statistics/StatisticsApplication.java
+++ b/statistics/src/main/java/cz/muni/fi/pa165/statistics/StatisticsApplication.java
@@ -6,8 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class StatisticsApplication {
- public static void main(String[] args) {
- SpringApplication.run(StatisticsApplication.class, args);
- }
-
+ public static void main(String[] args) {
+ SpringApplication.run(StatisticsApplication.class, args);
+ }
}
diff --git a/statistics/src/test/java/cz/muni/fi/pa165/statistics/StatisticsApplicationTest.java b/statistics/src/test/java/cz/muni/fi/pa165/statistics/StatisticsApplicationTest.java
index 07c0c26..6c25c40 100644
--- a/statistics/src/test/java/cz/muni/fi/pa165/statistics/StatisticsApplicationTest.java
+++ b/statistics/src/test/java/cz/muni/fi/pa165/statistics/StatisticsApplicationTest.java
@@ -6,8 +6,6 @@ import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class StatisticsApplicationTest {
- @Test
- void contextLoads() {
- }
-
-}
\ No newline at end of file
+ @Test
+ void contextLoads() {}
+}
--
GitLab