diff --git a/pom.xml b/pom.xml index 243ec56..a3c9d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,28 +15,27 @@ target config - 11 - 11 - - 3.20.2 - 32.0.0-jre - 5.7.2 - 3.11.2 - 3.8.1 - 3.0.0-M4 - 3.1.1 - 3.13.0 - 4.8.2.0 - 1.5.1 - 0.12 - 3.12.0 + 21 + 21 + + 3.25.3 + 33.2.1-jre + 5.10.2 + 5.11.0 + 3.13.0 + 3.2.5 + 3.3.1 + 4.8.5.0 + 1.16.1 + 1.2.1 + 3.14.0 1.18.30 org.springframework.boot spring-boot-starter-parent - 2.2.6.RELEASE + 3.2.5 @@ -226,24 +225,6 @@ - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - - validate - - check - - - - - 11 - false - - - com.github.spotbugs spotbugs-maven-plugin diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/Assignee.java b/src/main/java/com/smalaca/taskamanager/model/embedded/Assignee.java index b020d35..9ad7417 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/Assignee.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/Assignee.java @@ -1,7 +1,7 @@ package com.smalaca.taskamanager.model.embedded; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class Assignee { diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/EmailAddress.java b/src/main/java/com/smalaca/taskamanager/model/embedded/EmailAddress.java index c6d0136..12cd2c3 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/EmailAddress.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/EmailAddress.java @@ -3,7 +3,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class EmailAddress { diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/Owner.java b/src/main/java/com/smalaca/taskamanager/model/embedded/Owner.java index 73be8ba..2bdb2bb 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/Owner.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/Owner.java @@ -1,10 +1,10 @@ package com.smalaca.taskamanager.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class Owner { @@ -14,8 +14,8 @@ public class Owner { private String lastName; @Embedded @AttributeOverrides({ - @AttributeOverride(name = "prefix", column = @Column(name = "owner_phone_prefix")), - @AttributeOverride(name = "number", column = @Column(name = "owner_phone_number")) + @AttributeOverride(name = "prefix", column = @Column(name = "owner_phone_prefix")), + @AttributeOverride(name = "number", column = @Column(name = "owner_phone_number")) }) private PhoneNumber phoneNumber; @Embedded diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/PhoneNumber.java b/src/main/java/com/smalaca/taskamanager/model/embedded/PhoneNumber.java index 7f97257..df5e3dc 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/PhoneNumber.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/PhoneNumber.java @@ -3,8 +3,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable public class PhoneNumber { diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/Stakeholder.java b/src/main/java/com/smalaca/taskamanager/model/embedded/Stakeholder.java index c0c1cdc..50136a7 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/Stakeholder.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/Stakeholder.java @@ -3,8 +3,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class Stakeholder { diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/UserName.java b/src/main/java/com/smalaca/taskamanager/model/embedded/UserName.java index e3873a9..607f7b0 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/UserName.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/UserName.java @@ -3,7 +3,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class UserName { diff --git a/src/main/java/com/smalaca/taskamanager/model/embedded/Watcher.java b/src/main/java/com/smalaca/taskamanager/model/embedded/Watcher.java index 2e81aaa..2ecc96c 100644 --- a/src/main/java/com/smalaca/taskamanager/model/embedded/Watcher.java +++ b/src/main/java/com/smalaca/taskamanager/model/embedded/Watcher.java @@ -3,8 +3,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; @Embeddable public class Watcher { diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Epic.java b/src/main/java/com/smalaca/taskamanager/model/entities/Epic.java index 3ef5f33..8384f49 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Epic.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Epic.java @@ -7,13 +7,13 @@ import com.smalaca.taskamanager.model.enums.ToDoItemStatus; import com.smalaca.taskamanager.model.interfaces.ToDoItem; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/ProductOwner.java b/src/main/java/com/smalaca/taskamanager/model/entities/ProductOwner.java index c7739e3..d05c71d 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/ProductOwner.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/ProductOwner.java @@ -3,11 +3,11 @@ import com.smalaca.taskamanager.model.embedded.EmailAddress; import com.smalaca.taskamanager.model.embedded.PhoneNumber; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Project.java b/src/main/java/com/smalaca/taskamanager/model/entities/Project.java index 37fdefc..9fe8a5c 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Project.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Project.java @@ -4,11 +4,11 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Sprint.java b/src/main/java/com/smalaca/taskamanager/model/entities/Sprint.java index d06893e..53802d4 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Sprint.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Sprint.java @@ -1,11 +1,11 @@ package com.smalaca.taskamanager.model.entities; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Story.java b/src/main/java/com/smalaca/taskamanager/model/entities/Story.java index 011698f..6418a53 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Story.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Story.java @@ -7,14 +7,14 @@ import com.smalaca.taskamanager.model.enums.ToDoItemStatus; import com.smalaca.taskamanager.model.interfaces.ToDoItem; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Task.java b/src/main/java/com/smalaca/taskamanager/model/entities/Task.java index b6a1207..71250f0 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Task.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Task.java @@ -7,12 +7,12 @@ import com.smalaca.taskamanager.model.enums.ToDoItemStatus; import com.smalaca.taskamanager.model.interfaces.ToDoItem; -import javax.persistence.ElementCollection; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/Team.java b/src/main/java/com/smalaca/taskamanager/model/entities/Team.java index 94aa683..8561e00 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/Team.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/Team.java @@ -4,12 +4,12 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ public class Team { private String description; - @OneToMany + @ManyToMany private List members = new ArrayList<>(); @ManyToOne diff --git a/src/main/java/com/smalaca/taskamanager/model/entities/User.java b/src/main/java/com/smalaca/taskamanager/model/entities/User.java index 4471e39..c09a4b7 100644 --- a/src/main/java/com/smalaca/taskamanager/model/entities/User.java +++ b/src/main/java/com/smalaca/taskamanager/model/entities/User.java @@ -7,17 +7,19 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; @Entity +@Table(name = "USERS") @SuppressWarnings("MethodCount") public class User { @Id @@ -38,7 +40,7 @@ public class User { @Enumerated(EnumType.STRING) private TeamRole teamRole; - @OneToMany + @ManyToMany(mappedBy = "members") private List teams = new ArrayList<>(); public UserName getUserName() { diff --git a/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryTeamRepository.java b/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryTeamRepository.java index ae4e754..ea353d8 100644 --- a/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryTeamRepository.java +++ b/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryTeamRepository.java @@ -111,6 +111,11 @@ public void delete(Team team) { teams.remove(team.getId()); } + @Override + public void deleteAllById(Iterable longs) { + + } + @Override public void deleteAll(Iterable iterable) { diff --git a/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryUserRepository.java b/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryUserRepository.java index cf84183..30644c0 100644 --- a/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryUserRepository.java +++ b/src/test/java/com/smalaca/taskamanager/api/rest/InMemoryUserRepository.java @@ -137,6 +137,11 @@ public void delete(User user) { users.remove(user.getId()); } + @Override + public void deleteAllById(Iterable longs) { + + } + @Override public void deleteAll(Iterable iterable) {