From 2d06ca9e242c1db46a31a77dc69bfd40f6b5fb43 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 24 Feb 2025 21:49:56 +0400 Subject: [PATCH] #3 -- Fix models --- .../java/ru/ulstu/fc/core/BaseEntity.java | 86 ------------------- .../ru/ulstu/fc/project/model/Project.java | 2 +- .../ulstu/fc/project/model/ProjectForm.java | 3 + .../ru/ulstu/fc/rule/model/AddRuleForm.java | 13 --- .../ru/ulstu/fc/rule/model/AddTermForm.java | 40 --------- .../ulstu/fc/rule/model/AddVariableForm.java | 31 ------- .../java/ru/ulstu/fc/rule/model/Rule.java | 18 ---- .../java/ru/ulstu/fc/rule/model/Term.java | 45 ---------- .../fc/rule/repository/RuleRepository.java | 7 -- .../fc/rule/repository/TermRepository.java | 7 -- .../ru/ulstu/fc/rule/service/RuleService.java | 20 ----- .../ru/ulstu/fc/rule/service/TermService.java | 20 ----- .../ulstu/fc/rule/service/TermsService.java | 20 ----- 13 files changed, 4 insertions(+), 308 deletions(-) delete mode 100644 src/main/java/ru/ulstu/fc/core/BaseEntity.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/model/AddRuleForm.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/model/AddTermForm.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/model/AddVariableForm.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/model/Rule.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/model/Term.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/repository/RuleRepository.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/repository/TermRepository.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/service/RuleService.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/service/TermService.java delete mode 100644 src/main/java/ru/ulstu/fc/rule/service/TermsService.java diff --git a/src/main/java/ru/ulstu/fc/core/BaseEntity.java b/src/main/java/ru/ulstu/fc/core/BaseEntity.java deleted file mode 100644 index 55542dc..0000000 --- a/src/main/java/ru/ulstu/fc/core/BaseEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -package ru.ulstu.fc.core; - -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; -import java.io.Serializable; - -@MappedSuperclass -public abstract class BaseEntity implements Serializable, Comparable { - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - private Integer id; - - @Version - private Integer version; - - public BaseEntity() { - } - - public BaseEntity(Integer id, Integer version) { - this.id = id; - this.version = version; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getVersion() { - return version; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!getClass().isAssignableFrom(obj.getClass())) { - return false; - } - BaseEntity other = (BaseEntity) obj; - if (id == null) { - if (other.getId() != null) { - return false; - } - } else if (!id.equals(other.getId())) { - return false; - } - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (id == null ? 0 : id.hashCode()); - return result; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "{" + - "id=" + id + - ", version=" + version + - '}'; - } - - @Override - public int compareTo(BaseEntity o) { - return id != null ? id.compareTo(o.getId()) : -1; - } - - public void reset() { - this.id = null; - this.version = null; - } -} diff --git a/src/main/java/ru/ulstu/fc/project/model/Project.java b/src/main/java/ru/ulstu/fc/project/model/Project.java index df655b0..e5ff8c7 100644 --- a/src/main/java/ru/ulstu/fc/project/model/Project.java +++ b/src/main/java/ru/ulstu/fc/project/model/Project.java @@ -11,7 +11,7 @@ import java.util.Date; @Entity public class Project extends BaseEntity { - @NotEmpty(message = "Текст новости не может быть пустым") + @NotEmpty(message = "Название проекта не может быть пустым") private String name; private Date createDate = new Date(); @ManyToOne(cascade = CascadeType.MERGE) diff --git a/src/main/java/ru/ulstu/fc/project/model/ProjectForm.java b/src/main/java/ru/ulstu/fc/project/model/ProjectForm.java index a03532b..b2a10c9 100644 --- a/src/main/java/ru/ulstu/fc/project/model/ProjectForm.java +++ b/src/main/java/ru/ulstu/fc/project/model/ProjectForm.java @@ -1,9 +1,12 @@ package ru.ulstu.fc.project.model; +import jakarta.validation.constraints.NotEmpty; + import java.util.Date; public class ProjectForm { private Integer id; + @NotEmpty(message = "Название проекта не может быть пустым") private String name; private Date createDate; diff --git a/src/main/java/ru/ulstu/fc/rule/model/AddRuleForm.java b/src/main/java/ru/ulstu/fc/rule/model/AddRuleForm.java deleted file mode 100644 index 4ddac74..0000000 --- a/src/main/java/ru/ulstu/fc/rule/model/AddRuleForm.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.ulstu.fc.rule.model; - -public class AddRuleForm { - private String rule; - - public String getRule() { - return rule; - } - - public void setRule(String rule) { - this.rule = rule; - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/model/AddTermForm.java b/src/main/java/ru/ulstu/fc/rule/model/AddTermForm.java deleted file mode 100644 index 28924d5..0000000 --- a/src/main/java/ru/ulstu/fc/rule/model/AddTermForm.java +++ /dev/null @@ -1,40 +0,0 @@ -package ru.ulstu.fc.rule.model; - -public class AddTermForm { - private String variable; - private String term; - private String min; - private String max; - - public String getVariable() { - return variable; - } - - public void setVariable(String variable) { - this.variable = variable; - } - - public String getTerm() { - return term; - } - - public void setTerm(String term) { - this.term = term; - } - - public String getMin() { - return min; - } - - public void setMin(String min) { - this.min = min; - } - - public String getMax() { - return max; - } - - public void setMax(String max) { - this.max = max; - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/model/AddVariableForm.java b/src/main/java/ru/ulstu/fc/rule/model/AddVariableForm.java deleted file mode 100644 index b6e5619..0000000 --- a/src/main/java/ru/ulstu/fc/rule/model/AddVariableForm.java +++ /dev/null @@ -1,31 +0,0 @@ -package ru.ulstu.fc.rule.model; - -public class AddVariableForm { - private Integer id; - private String name; - - public AddVariableForm(Variable variable) { - this.id = variable.getId(); - this.name = variable.getName(); - } - - public AddVariableForm() { - - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/model/Rule.java b/src/main/java/ru/ulstu/fc/rule/model/Rule.java deleted file mode 100644 index 22c3b3a..0000000 --- a/src/main/java/ru/ulstu/fc/rule/model/Rule.java +++ /dev/null @@ -1,18 +0,0 @@ -package ru.ulstu.fc.rule.model; - -import ru.ulstu.fc.core.BaseEntity; - -import javax.persistence.Entity; - -@Entity -public class Rule extends BaseEntity { - private String value; - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/model/Term.java b/src/main/java/ru/ulstu/fc/rule/model/Term.java deleted file mode 100644 index 6b7b917..0000000 --- a/src/main/java/ru/ulstu/fc/rule/model/Term.java +++ /dev/null @@ -1,45 +0,0 @@ -package ru.ulstu.fc.rule.model; - -import ru.ulstu.fc.core.BaseEntity; - -import javax.persistence.Entity; - -@Entity -public class Term extends BaseEntity { - private String name; - private double min; - private double max; - - public Term() { - } - - public Term(String name, double min, double max) { - this.name = name; - this.min = min; - this.max = max; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getMin() { - return min; - } - - public void setMin(double min) { - this.min = min; - } - - public double getMax() { - return max; - } - - public void setMax(double max) { - this.max = max; - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/repository/RuleRepository.java b/src/main/java/ru/ulstu/fc/rule/repository/RuleRepository.java deleted file mode 100644 index eeac0e9..0000000 --- a/src/main/java/ru/ulstu/fc/rule/repository/RuleRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.ulstu.fc.rule.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import ru.ulstu.fc.rule.model.Rule; - -public interface RuleRepository extends JpaRepository { -} diff --git a/src/main/java/ru/ulstu/fc/rule/repository/TermRepository.java b/src/main/java/ru/ulstu/fc/rule/repository/TermRepository.java deleted file mode 100644 index 00efd09..0000000 --- a/src/main/java/ru/ulstu/fc/rule/repository/TermRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.ulstu.fc.rule.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import ru.ulstu.fc.rule.model.Term; - -public interface TermRepository extends JpaRepository { -} diff --git a/src/main/java/ru/ulstu/fc/rule/service/RuleService.java b/src/main/java/ru/ulstu/fc/rule/service/RuleService.java deleted file mode 100644 index 0969087..0000000 --- a/src/main/java/ru/ulstu/fc/rule/service/RuleService.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.ulstu.fc.rule.service; - -import org.springframework.stereotype.Service; -import ru.ulstu.fc.rule.model.Rule; -import ru.ulstu.fc.rule.repository.RuleRepository; - -import java.util.List; - -@Service -public class RuleService { - private final RuleRepository ruleRepository; - - public RuleService(RuleRepository ruleRepository) { - this.ruleRepository = ruleRepository; - } - - public List getRules() { - return ruleRepository.findAll(); - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/service/TermService.java b/src/main/java/ru/ulstu/fc/rule/service/TermService.java deleted file mode 100644 index a475aab..0000000 --- a/src/main/java/ru/ulstu/fc/rule/service/TermService.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.ulstu.fc.rule.service; - -import org.springframework.stereotype.Service; -import ru.ulstu.fc.rule.model.Term; -import ru.ulstu.fc.rule.repository.TermRepository; - -import java.util.List; - -@Service -public class TermService { - private final TermRepository termRepository; - - public TermService(TermRepository termRepository) { - this.termRepository = termRepository; - } - - public List getTerms() { - return termRepository.findAll(); - } -} diff --git a/src/main/java/ru/ulstu/fc/rule/service/TermsService.java b/src/main/java/ru/ulstu/fc/rule/service/TermsService.java deleted file mode 100644 index 273e0fa..0000000 --- a/src/main/java/ru/ulstu/fc/rule/service/TermsService.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.ulstu.fc.rule.service; - -import org.springframework.stereotype.Service; -import ru.ulstu.fc.rule.model.Term; -import ru.ulstu.fc.rule.repository.TermRepository; - -import java.util.List; - -@Service -public class TermsService { - private final TermRepository termRepository; - - public TermsService(TermRepository termRepository) { - this.termRepository = termRepository; - } - - public List getTerms() { - return termRepository.findAll(); - } -}