From c0f8bb45f973debf7005883fcbda86bbbd8f2314 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Mon, 1 Feb 2021 09:00:59 +0100
Subject: [PATCH] [Cleanup] Remove attachments
---
.../example/demo/config/SwaggerConfig.java | 1 -
.../com/example/demo/domain/Attachment.java | 59 -------------------
.../java/com/example/demo/domain/Task.java | 12 ----
.../com/example/demo/dto/AttachmentDto.java | 40 -------------
.../java/com/example/demo/dto/TaskDto.java | 12 ----
.../com/example/demo/dto/TaskUpdateDto.java | 11 ----
.../dto/input/GameDefinitionCreateDto.java | 11 ----
.../com/example/demo/mapper/BeanMapper.java | 6 --
8 files changed, 152 deletions(-)
delete mode 100644 src/main/java/com/example/demo/domain/Attachment.java
delete mode 100644 src/main/java/com/example/demo/dto/AttachmentDto.java
diff --git a/src/main/java/com/example/demo/config/SwaggerConfig.java b/src/main/java/com/example/demo/config/SwaggerConfig.java
index 560da796..f9d6e88c 100644
--- a/src/main/java/com/example/demo/config/SwaggerConfig.java
+++ b/src/main/java/com/example/demo/config/SwaggerConfig.java
@@ -2,7 +2,6 @@ package com.example.demo.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.spi.DocumentationType;
diff --git a/src/main/java/com/example/demo/domain/Attachment.java b/src/main/java/com/example/demo/domain/Attachment.java
deleted file mode 100644
index 89ee2e8f..00000000
--- a/src/main/java/com/example/demo/domain/Attachment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.example.demo.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.time.LocalDateTime;
-
-@Entity
-public class Attachment {
-
- @Id
- @GeneratedValue
- private Long id;
-
- private String content;
- private LocalDateTime creationTime;
-
-// @ManyToOne(fetch = FetchType.LAZY)
-// private Task task;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public LocalDateTime getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(LocalDateTime creationTime) {
- this.creationTime = creationTime;
- }
-
-// public Task getTask() {
-// return task;
-// }
-
-// public void setTask(Task task) {
-// this.task = task;
-// }
-
- @Override
- public String toString() {
- return "Attachment{" + "id=" + id + ", content='" + content + '\'' + ", creationTime=" + creationTime + '}';
- }
-}
diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/com/example/demo/domain/Task.java
index e938af9c..95874eaa 100644
--- a/src/main/java/com/example/demo/domain/Task.java
+++ b/src/main/java/com/example/demo/domain/Task.java
@@ -16,10 +16,6 @@ public class Task extends AbstractPhase {
@ManyToOne(fetch = FetchType.LAZY)
private TrainingPhase trainingPhase;
-// @OrderBy
-// @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
-// private List<Attachment> attachments;
-
public String getContent() {
return content;
}
@@ -44,14 +40,6 @@ public class Task extends AbstractPhase {
this.solution = solution;
}
-// public List<Attachment> getAttachments() {
-// return attachments;
-// }
-
-// public void setAttachments(List<Attachment> attachments) {
-// this.attachments = attachments;
-// }
-
public Long getIncorrectFlagLimit() {
return incorrectFlagLimit;
}
diff --git a/src/main/java/com/example/demo/dto/AttachmentDto.java b/src/main/java/com/example/demo/dto/AttachmentDto.java
deleted file mode 100644
index 99059032..00000000
--- a/src/main/java/com/example/demo/dto/AttachmentDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.example.demo.dto;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-public class AttachmentDto implements Serializable {
-
- private Long id;
- private String content;
- private LocalDateTime creationTime;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public LocalDateTime getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(LocalDateTime creationTime) {
- this.creationTime = creationTime;
- }
-
- @Override
- public String toString() {
- return "AttachmentDto{" + "id=" + id + ", content='" + content + '\'' + ", creationTime=" + creationTime + '}';
- }
-}
diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/com/example/demo/dto/TaskDto.java
index d346aae0..7e3e0b88 100644
--- a/src/main/java/com/example/demo/dto/TaskDto.java
+++ b/src/main/java/com/example/demo/dto/TaskDto.java
@@ -9,9 +9,6 @@ public class TaskDto extends AbstractPhaseDto implements Serializable {
private String solution;
private Long incorrectFlagLimit;
-// private List<AttachmentDto> attachments;
-
-
public String getContent() {
return content;
}
@@ -36,14 +33,6 @@ public class TaskDto extends AbstractPhaseDto implements Serializable {
this.solution = solution;
}
-// public List<AttachmentDto> getAttachments() {
-// return attachments;
-// }
-
-// public void setAttachments(List<AttachmentDto> attachments) {
-// this.attachments = attachments;
-// }
-
public Long getIncorrectFlagLimit() {
return incorrectFlagLimit;
}
@@ -59,7 +48,6 @@ public class TaskDto extends AbstractPhaseDto implements Serializable {
", flag='" + flag + '\'' +
", solution='" + solution + '\'' +
", incorrectFlagLimit='" + incorrectFlagLimit + '\'' +
-// ", attachments=" + attachments +
"} " + super.toString();
}
}
diff --git a/src/main/java/com/example/demo/dto/TaskUpdateDto.java b/src/main/java/com/example/demo/dto/TaskUpdateDto.java
index a1726bef..15c8bc85 100644
--- a/src/main/java/com/example/demo/dto/TaskUpdateDto.java
+++ b/src/main/java/com/example/demo/dto/TaskUpdateDto.java
@@ -34,8 +34,6 @@ public class TaskUpdateDto {
@PositiveOrZero(message = "Limit of the number of provided incorrect flags must not be a negative number")
private Integer incorrectFlagLimit;
-// private List<AttachmentDto> attachments;
-
public Long getId() {
return id;
}
@@ -77,14 +75,6 @@ public class TaskUpdateDto {
this.solution = solution;
}
-// public List<AttachmentDto> getAttachments() {
-// return attachments;
-// }
-
-// public void setAttachments(List<AttachmentDto> attachments) {
-// this.attachments = attachments;
-// }
-
public Integer getIncorrectFlagLimit() {
return incorrectFlagLimit;
}
@@ -102,7 +92,6 @@ public class TaskUpdateDto {
", flag='" + flag + '\'' +
", solution='" + solution + '\'' +
", incorrectFlagLimit=" + incorrectFlagLimit +
-// ", attachments=" + attachments +
'}';
}
}
diff --git a/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java b/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
index cee9b750..cde65bcd 100644
--- a/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
+++ b/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
@@ -1,6 +1,5 @@
package com.example.demo.dto.input;
-import com.example.demo.dto.AttachmentDto;
import com.example.demo.enums.PhaseType;
import java.util.List;
@@ -18,8 +17,6 @@ public class GameDefinitionCreateDto {
private String solution;
private Long incorrectFlagLimit;
- private List<AttachmentDto> attachments;
-
// info level fields
// currently none special
@@ -90,14 +87,6 @@ public class GameDefinitionCreateDto {
this.incorrectFlagLimit = incorrectFlagLimit;
}
- public List<AttachmentDto> getAttachments() {
- return attachments;
- }
-
- public void setAttachments(List<AttachmentDto> attachments) {
- this.attachments = attachments;
- }
-
public List<GameDefinitionCreateDto> getSubLevels() {
return subLevels;
}
diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 41e6bcb9..8b05d851 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/com/example/demo/mapper/BeanMapper.java
@@ -1,7 +1,6 @@
package com.example.demo.mapper;
import com.example.demo.domain.AbstractPhase;
-import com.example.demo.domain.Attachment;
import com.example.demo.domain.DecisionMatrixRow;
import com.example.demo.domain.InfoPhase;
import com.example.demo.domain.TrainingPhase;
@@ -10,7 +9,6 @@ import com.example.demo.domain.QuestionChoice;
import com.example.demo.domain.QuestionnaireLevel;
import com.example.demo.domain.Task;
import com.example.demo.dto.AbstractPhaseDto;
-import com.example.demo.dto.AttachmentDto;
import com.example.demo.dto.DecisionMatrixRowDto;
import com.example.demo.dto.InfoPhaseDto;
import com.example.demo.dto.InfoPhaseUpdateDto;
@@ -71,10 +69,6 @@ public interface BeanMapper {
InfoPhase toEntity(InfoPhaseUpdateDto infoPhaseUpdateDto);
- AttachmentDto toDto(Attachment attachment);
-
- Attachment toEntity(AttachmentDto attachment);
-
@Mapping(target = "phaseType", constant = "GAME")
TrainingPhaseDto toDto(TrainingPhase trainingPhase);
--
GitLab