Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 15 additions & 34 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,27 @@
<project.build.directory>target</project.build.directory>
<project.config.directory>config</project.config.directory>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<assertj.core.version>3.20.2</assertj.core.version>
<guava.version>32.0.0-jre</guava.version>
<junit-jupiter.version>5.7.2</junit-jupiter.version>
<mockito-junit-jupiter.version>3.11.2</mockito-junit-jupiter.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<maven-pmd-plugin.version>3.13.0</maven-pmd-plugin.version>
<spotbugs-maven-plugin.version>4.8.2.0</spotbugs-maven-plugin.version>
<pitest-maven.version>1.5.1</pitest-maven.version>
<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>

<assertj.core.version>3.25.3</assertj.core.version>
<guava.version>33.2.1-jre</guava.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito-junit-jupiter.version>5.11.0</mockito-junit-jupiter.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<spotbugs-maven-plugin.version>4.8.5.0</spotbugs-maven-plugin.version>
<pitest-maven.version>1.16.1</pitest-maven.version>
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<lombok.version>1.18.30</lombok.version>
</properties>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
<version>3.2.5</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -226,24 +225,6 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${maven-pmd-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<targetJdk>11</targetJdk>
<linkXRef>false</linkXRef>
</configuration>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/smalaca/taskamanager/model/embedded/Owner.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/smalaca/taskamanager/model/entities/Epic.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/smalaca/taskamanager/model/entities/Story.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/smalaca/taskamanager/model/entities/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/smalaca/taskamanager/model/entities/Team.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -26,7 +26,7 @@ public class Team {

private String description;

@OneToMany
@ManyToMany
private List<User> members = new ArrayList<>();

@ManyToOne
Expand Down
18 changes: 10 additions & 8 deletions src/main/java/com/smalaca/taskamanager/model/entities/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,7 +40,7 @@ public class User {
@Enumerated(EnumType.STRING)
private TeamRole teamRole;

@OneToMany
@ManyToMany(mappedBy = "members")
private List<Team> teams = new ArrayList<>();

public UserName getUserName() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@
teams.remove(team.getId());
}

@Override
public void deleteAllById(Iterable<? extends Long> longs) {

Check failure on line 115 in src/test/java/com/smalaca/taskamanager/api/rest/InMemoryTeamRepository.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.

See more on https://sonarcloud.io/project/issues?id=smalaca_legacy-code-task-manager&issues=AZ6IElb1SLWvIaArnK0V&open=AZ6IElb1SLWvIaArnK0V&pullRequest=62

}

@Override
public void deleteAll(Iterable<? extends Team> iterable) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@
users.remove(user.getId());
}

@Override
public void deleteAllById(Iterable<? extends Long> longs) {

Check failure on line 141 in src/test/java/com/smalaca/taskamanager/api/rest/InMemoryUserRepository.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.

See more on https://sonarcloud.io/project/issues?id=smalaca_legacy-code-task-manager&issues=AZ6IEle4SLWvIaArnK0W&open=AZ6IEle4SLWvIaArnK0W&pullRequest=62

}

@Override
public void deleteAll(Iterable<? extends User> iterable) {

Expand Down
Loading