Skip to content
Snippets Groups Projects
Commit 57eb8549 authored by Jan Tymel's avatar Jan Tymel
Browse files

[Cleanup] Change project GAV to a more production-ready one, remove unused maven dependencies

parent b9c2566a
No related branches found
No related tags found
No related merge requests found
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
<version>2.2.4.RELEASE</version> <version>2.2.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com.example</groupId> <groupId>cz.muni.ics.kypo</groupId>
<artifactId>demo</artifactId> <artifactId>kypo2-adaptive-training</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>demo</name> <name>KYPO2 Adaptive Training</name>
<description>Demo project for Spring Boot</description> <description>KYPO2 Adaptive Training</description>
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>
<projectlombok.version>1.18.12</projectlombok.version>
<org.mapstruct.version>1.3.1.Final</org.mapstruct.version> <org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
<swagger.version>2.9.2</swagger.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -49,51 +49,28 @@ ...@@ -49,51 +49,28 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- TODO: just for development purposes-->
<!-- <dependency>-->
<!-- <groupId>com.h2database</groupId>-->
<!-- <artifactId>h2</artifactId>-->
<!-- <version>1.4.200</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<!-- <version>${projectlombok.version}</version>-->
</dependency>
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <artifactId>mapstruct</artifactId>
<version>1.3.1.Final</version> <version>${org.mapstruct.version}</version>
<!-- <version>${org.mapstruct.version}</version>-->
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency> </dependency>
<!-- swagger --> <!-- swagger -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version> <version>${swagger.version}</version>
<!-- <version>${swagger.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version> <version>${swagger.version}</version>
<!-- <version>${swagger.version}</version>-->
</dependency> </dependency>
</dependencies> </dependencies>
......
package com.example.demo; package com.example.demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class DemoApplication { public class DemoApplication {
private static final Logger log = LoggerFactory.getLogger(DemoApplication.class);
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args); SpringApplication.run(DemoApplication.class, args);
} }
// @Bean
// CommandLineRunner anotherDemo(GameLevelRepository gameLevelRepository) {
// return args -> {
//
// gameLevelRepository.deleteAll();
//
// GameLevel gameLevel = new GameLevel();
// gameLevel.setTitle("Title");
//
//
// GameLevel savedGameLevel = gameLevelRepository.save(gameLevel);
// log.info("Saved game level: {}", savedGameLevel);
//
// Optional<GameLevel> foundGameLevel = gameLevelRepository.findById(savedGameLevel.getId());
// log.info("Saved game level: {}", foundGameLevel);
// };
// }
//
// @Bean
// CommandLineRunner yetAnotherDemo(GameLevelService gameLevelService) {
// return args -> {
//
// List<GameLevelDto> allGameLevels = gameLevelService.findAllGameLevels();
// allGameLevels.forEach(gameLevel -> log.info("Found game level with ID {} and title {}", gameLevel.getId(),
// gameLevel.getTitle()));
// };
// }
} }
...@@ -8,7 +8,6 @@ import com.example.demo.dto.TaskUpdateDto; ...@@ -8,7 +8,6 @@ import com.example.demo.dto.TaskUpdateDto;
import com.example.demo.mapper.BeanMapper; import com.example.demo.mapper.BeanMapper;
import com.example.demo.repository.TaskRepository; import com.example.demo.repository.TaskRepository;
import com.example.demo.repository.TrainingPhaseRepository; import com.example.demo.repository.TrainingPhaseRepository;
import org.apache.commons.collections4.IterableUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -16,9 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,9 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service @Service
public class TaskService { public class TaskService {
...@@ -84,21 +80,6 @@ public class TaskService { ...@@ -84,21 +80,6 @@ public class TaskService {
return BeanMapper.INSTANCE.toDto(persistedEntity); return BeanMapper.INSTANCE.toDto(persistedEntity);
} }
public List<TaskDto> findAllTasks() {
Iterable<Task> allTasks = taskRepository.findAll();
List<TaskDto> result = new ArrayList<>();
if (!IterableUtils.isEmpty(allTasks)) {
for (Task task : allTasks) {
result.add(BeanMapper.INSTANCE.toDto(task));
}
}
return result;
}
public TaskDto getTask(Long trainingDefinitionId, Long phaseId, Long taskId) { public TaskDto getTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
Task task = taskRepository.findById(taskId) Task task = taskRepository.findById(taskId)
.orElseThrow(() -> new RuntimeException("Task was not found")); .orElseThrow(() -> new RuntimeException("Task was not found"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment