Skip to content

Commit 2b870b5

Browse files
mhinkiemhinkie
committed
replaced imports with single class imports
1 parent 6d2899c commit 2b870b5

20 files changed

+214
-132
lines changed

‎src/main/java/io/github/patternatlas/api/entities/candidate/Candidate.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
package io.github.patternatlas.api.entities.candidate;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
3+
import java.util.ArrayList;
4+
import java.util.HashSet;
5+
import java.util.List;
6+
import java.util.Set;
57

68
import io.github.patternatlas.api.entities.EntityWithURI;
79
import io.github.patternatlas.api.entities.PatternLanguage;
810
import io.github.patternatlas.api.entities.candidate.author.CandidateAuthor;
911
import io.github.patternatlas.api.entities.candidate.comment.CandidateComment;
1012
import io.github.patternatlas.api.entities.candidate.evidence.CandidateEvidence;
11-
import io.github.patternatlas.api.entities.issue.evidence.IssueEvidence;
1213
import io.github.patternatlas.api.rest.model.candidate.CandidateModelRequest;
1314

15+
import com.fasterxml.jackson.annotation.JsonIgnore;
16+
import com.fasterxml.jackson.annotation.JsonProperty;
17+
import javax.persistence.CascadeType;
18+
import javax.persistence.Column;
19+
import javax.persistence.Entity;
20+
import javax.persistence.ManyToOne;
21+
import javax.persistence.OneToMany;
22+
import javax.validation.constraints.NotNull;
1423
import lombok.Data;
1524
import lombok.EqualsAndHashCode;
1625
import lombok.NoArgsConstructor;
1726
import lombok.ToString;
18-
1927
import org.hibernate.annotations.Type;
2028

21-
import javax.persistence.*;
22-
import javax.validation.constraints.NotNull;
23-
import java.util.*;
24-
2529
@Entity
2630
@Data
2731
@EqualsAndHashCode(callSuper = true)

‎src/main/java/io/github/patternatlas/api/entities/issue/Issue.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package io.github.patternatlas.api.entities.issue;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
3+
import java.util.ArrayList;
4+
import java.util.List;
55

66
import io.github.patternatlas.api.entities.EntityWithURI;
77
import io.github.patternatlas.api.entities.issue.author.IssueAuthor;
88
import io.github.patternatlas.api.entities.issue.comment.IssueComment;
99
import io.github.patternatlas.api.entities.issue.evidence.IssueEvidence;
1010
import io.github.patternatlas.api.rest.model.issue.IssueModelRequest;
1111

12-
import lombok.*;
13-
14-
import javax.persistence.*;
15-
import java.util.*;
12+
import com.fasterxml.jackson.annotation.JsonIgnore;
13+
import com.fasterxml.jackson.annotation.JsonProperty;
14+
import javax.persistence.CascadeType;
15+
import javax.persistence.Entity;
16+
import javax.persistence.OneToMany;
17+
import lombok.Data;
18+
import lombok.EqualsAndHashCode;
19+
import lombok.NoArgsConstructor;
1620

1721
@Entity
1822
@Data

‎src/main/java/io/github/patternatlas/api/entities/issue/IssueRating.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package io.github.patternatlas.api.entities.issue;
22

3-
import lombok.*;
4-
5-
import javax.persistence.*;
63
import java.util.Objects;
74

8-
import io.github.patternatlas.api.entities.user.UserEntity;
9-
import io.github.patternatlas.api.entities.issue.Issue;
105
import io.github.patternatlas.api.entities.shared.CompositeKey;
6+
import io.github.patternatlas.api.entities.user.UserEntity;
7+
8+
import javax.persistence.EmbeddedId;
9+
import javax.persistence.Entity;
10+
import javax.persistence.ManyToOne;
11+
import javax.persistence.MapsId;
12+
import lombok.Data;
13+
import lombok.EqualsAndHashCode;
14+
import lombok.NoArgsConstructor;
1115

1216
@Entity
1317
@Data

‎src/main/java/io/github/patternatlas/api/entities/issue/comment/IssueComment.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package io.github.patternatlas.api.entities.issue.comment;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
3+
import java.io.Serializable;
4+
import java.util.ArrayList;
5+
import java.util.List;
56

67
import io.github.patternatlas.api.entities.issue.Issue;
78
import io.github.patternatlas.api.entities.shared.Comment;
89
import io.github.patternatlas.api.entities.user.UserEntity;
9-
import io.github.patternatlas.api.entities.issue.comment.IssueCommentRating;
1010

11+
import com.fasterxml.jackson.annotation.JsonIgnore;
12+
import com.fasterxml.jackson.annotation.JsonProperty;
13+
import javax.persistence.CascadeType;
14+
import javax.persistence.Entity;
15+
import javax.persistence.ManyToOne;
16+
import javax.persistence.OneToMany;
1117
import lombok.Data;
1218
import lombok.EqualsAndHashCode;
1319
import lombok.NoArgsConstructor;
1420
import lombok.ToString;
1521

16-
import javax.persistence.*;
17-
import java.io.Serializable;
18-
import java.util.*;
19-
2022
@Entity
2123
@Data
2224
@NoArgsConstructor

‎src/main/java/io/github/patternatlas/api/entities/user/UserEntity.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
package io.github.patternatlas.api.entities.user;
22

33
import java.io.Serializable;
4-
import java.util.*;
5-
import javax.persistence.*;
6-
4+
import java.util.ArrayList;
5+
import java.util.HashSet;
6+
import java.util.List;
7+
import java.util.Objects;
8+
import java.util.Set;
9+
import java.util.UUID;
10+
11+
import javax.persistence.CascadeType;
12+
import javax.persistence.Column;
13+
import javax.persistence.Entity;
14+
import javax.persistence.GeneratedValue;
15+
import javax.persistence.Id;
16+
import javax.persistence.ManyToMany;
17+
import javax.persistence.OneToMany;
718
import org.hibernate.annotations.GenericGenerator;
819
import org.hibernate.annotations.NaturalId;
9-
import org.hibernate.annotations.Type;
10-
import org.hibernate.annotations.TypeDef;
1120

1221
import com.fasterxml.jackson.annotation.JsonIgnore;
1322
import com.fasterxml.jackson.annotation.JsonProperty;

‎src/main/java/io/github/patternatlas/api/entities/user/role/Privilege.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package io.github.patternatlas.api.entities.user.role;
22

3+
import javax.persistence.Column;
4+
import javax.persistence.Entity;
5+
import javax.persistence.GeneratedValue;
6+
import javax.persistence.Id;
7+
import javax.persistence.ManyToMany;
38
import lombok.Data;
49
import lombok.NoArgsConstructor;
510

6-
import javax.persistence.*;
711
import java.util.Collection;
812
import java.util.UUID;
913

‎src/main/java/io/github/patternatlas/api/entities/user/role/Role.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
import io.github.patternatlas.api.entities.user.UserEntity;
44

5+
import javax.persistence.CascadeType;
6+
import javax.persistence.Column;
7+
import javax.persistence.Entity;
8+
import javax.persistence.GeneratedValue;
9+
import javax.persistence.Id;
10+
import javax.persistence.ManyToMany;
511
import lombok.Data;
612
import lombok.NoArgsConstructor;
713

8-
import javax.persistence.*;
914
import java.util.Set;
1015
import java.util.UUID;
1116
import java.util.Collection;

‎src/main/java/io/github/patternatlas/api/rest/controller/AuthorController.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
package io.github.patternatlas.api.rest.controller;
22

3+
import java.util.List;
4+
import java.util.stream.Collectors;
5+
36
import io.github.patternatlas.api.entities.shared.AuthorConstant;
4-
import io.github.patternatlas.api.rest.model.candidate.CandidateModel;
5-
import io.github.patternatlas.api.rest.model.issue.IssueModel;
67
import io.github.patternatlas.api.rest.model.shared.AuthorModel;
78
import io.github.patternatlas.api.service.UserService;
89

910
import io.swagger.v3.oas.annotations.Operation;
1011
import io.swagger.v3.oas.annotations.responses.ApiResponse;
11-
1212
import org.springframework.hateoas.CollectionModel;
1313
import org.springframework.hateoas.EntityModel;
14-
import org.springframework.http.HttpStatus;
15-
import org.springframework.http.ResponseEntity;
16-
import org.springframework.security.access.prepost.PostFilter;
17-
import org.springframework.web.bind.annotation.*;
18-
19-
import java.util.ArrayList;
20-
import java.util.List;
21-
import java.util.UUID;
22-
import java.util.stream.Collectors;
14+
import org.springframework.web.bind.annotation.GetMapping;
15+
import org.springframework.web.bind.annotation.RequestMapping;
16+
import org.springframework.web.bind.annotation.RestController;
2317

2418
@RestController
2519
@RequestMapping(value = "/authors", produces = "application/hal+json")

‎src/main/java/io/github/patternatlas/api/rest/controller/CandidateController.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44

5-
import io.github.patternatlas.api.config.Authority;
65
import io.github.patternatlas.api.rest.model.candidate.CandidateModel;
76
import io.github.patternatlas.api.rest.model.candidate.CandidateModelRequest;
8-
import io.github.patternatlas.api.rest.model.issue.IssueModel;
9-
import io.github.patternatlas.api.rest.model.shared.*;
7+
import io.github.patternatlas.api.rest.model.shared.AuthorModelRequest;
8+
import io.github.patternatlas.api.rest.model.shared.CommentModel;
9+
import io.github.patternatlas.api.rest.model.shared.EvidenceModel;
10+
import io.github.patternatlas.api.rest.model.shared.RatingModelMultiRequest;
11+
import io.github.patternatlas.api.rest.model.shared.RatingModelRequest;
1012
import io.github.patternatlas.api.service.CandidateService;
1113
import io.github.patternatlas.api.service.PatternLanguageService;
1214

13-
import io.swagger.v3.core.util.Json;
1415
import io.swagger.v3.oas.annotations.Operation;
1516
import io.swagger.v3.oas.annotations.media.Content;
1617
import io.swagger.v3.oas.annotations.responses.ApiResponse;
1718

18-
import net.minidev.json.JSONArray;
19-
import net.minidev.json.JSONObject;
2019

2120
import org.slf4j.Logger;
2221
import org.slf4j.LoggerFactory;
@@ -25,10 +24,16 @@
2524
import org.springframework.hateoas.EntityModel;
2625
import org.springframework.http.HttpStatus;
2726
import org.springframework.http.ResponseEntity;
28-
import org.springframework.security.access.prepost.PostFilter;
29-
import org.springframework.security.access.prepost.PreAuthorize;
30-
import org.springframework.security.core.annotation.AuthenticationPrincipal;
31-
import org.springframework.web.bind.annotation.*;
27+
import org.springframework.web.bind.annotation.DeleteMapping;
28+
import org.springframework.web.bind.annotation.GetMapping;
29+
import org.springframework.web.bind.annotation.PathVariable;
30+
import org.springframework.web.bind.annotation.PostMapping;
31+
import org.springframework.web.bind.annotation.PutMapping;
32+
import org.springframework.web.bind.annotation.RequestBody;
33+
import org.springframework.web.bind.annotation.RequestMapping;
34+
import org.springframework.web.bind.annotation.RequestParam;
35+
import org.springframework.web.bind.annotation.ResponseStatus;
36+
import org.springframework.web.bind.annotation.RestController;
3237

3338
import java.security.Principal;
3439
import java.util.List;

‎src/main/java/io/github/patternatlas/api/rest/controller/IssueController.java‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
package io.github.patternatlas.api.rest.controller;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import java.security.Principal;
4+
import java.util.List;
5+
import java.util.UUID;
6+
import java.util.stream.Collectors;
47

5-
import io.github.patternatlas.api.config.Authority;
6-
import io.github.patternatlas.api.rest.model.issue.IssueModelRequest;
7-
import io.github.patternatlas.api.rest.model.shared.*;
88
import io.github.patternatlas.api.rest.model.issue.IssueModel;
9-
import io.github.patternatlas.api.service.*;
9+
import io.github.patternatlas.api.rest.model.issue.IssueModelRequest;
10+
import io.github.patternatlas.api.rest.model.shared.AuthorModelRequest;
11+
import io.github.patternatlas.api.rest.model.shared.CommentModel;
12+
import io.github.patternatlas.api.rest.model.shared.EvidenceModel;
13+
import io.github.patternatlas.api.rest.model.shared.RatingModelRequest;
14+
import io.github.patternatlas.api.service.IssueService;
15+
import io.github.patternatlas.api.service.PatternLanguageService;
1016

17+
import com.fasterxml.jackson.databind.ObjectMapper;
1118
import io.swagger.v3.oas.annotations.Operation;
1219
import io.swagger.v3.oas.annotations.responses.ApiResponse;
13-
14-
import liquibase.pro.packaged.P;
1520
import org.slf4j.Logger;
1621
import org.slf4j.LoggerFactory;
17-
1822
import org.springframework.hateoas.CollectionModel;
1923
import org.springframework.hateoas.EntityModel;
2024
import org.springframework.http.HttpStatus;
2125
import org.springframework.http.ResponseEntity;
22-
import org.springframework.security.access.prepost.PostAuthorize;
23-
import org.springframework.security.access.prepost.PostFilter;
24-
import org.springframework.security.access.prepost.PreAuthorize;
25-
import org.springframework.security.core.annotation.AuthenticationPrincipal;
26-
import org.springframework.web.bind.annotation.*;
27-
28-
import java.security.Principal;
29-
import java.util.Comparator;
30-
import java.util.List;
31-
import java.util.UUID;
32-
import java.util.stream.Collectors;
26+
import org.springframework.web.bind.annotation.DeleteMapping;
27+
import org.springframework.web.bind.annotation.GetMapping;
28+
import org.springframework.web.bind.annotation.PathVariable;
29+
import org.springframework.web.bind.annotation.PostMapping;
30+
import org.springframework.web.bind.annotation.PutMapping;
31+
import org.springframework.web.bind.annotation.RequestBody;
32+
import org.springframework.web.bind.annotation.RequestMapping;
33+
import org.springframework.web.bind.annotation.RequestParam;
34+
import org.springframework.web.bind.annotation.ResponseStatus;
35+
import org.springframework.web.bind.annotation.RestController;
3336

3437
@RestController
3538
@RequestMapping(value = "/issues", produces = "application/hal+json")

0 commit comments

Comments
 (0)