Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit e94040c

Browse files
dmeidlindmeidlin
committed
optimize imports
1 parent 6aab414 commit e94040c

File tree

16 files changed

+48
-124
lines changed

16 files changed

+48
-124
lines changed

‎src/main/java/io/swagger/model/SearchRequest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package io.swagger.model;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import com.fasterxml.jackson.annotation.JsonIgnore;
74
import com.fasterxml.jackson.annotation.JsonProperty;
8-
import com.fasterxml.jackson.annotation.JsonSubTypes;
9-
import com.fasterxml.jackson.annotation.JsonTypeInfo;
10-
import io.swagger.model.germ.GermplasmSearchRequest;
5+
6+
import java.util.ArrayList;
7+
import java.util.List;
118

129
public abstract class SearchRequest {
1310
@JsonIgnore

‎src/main/java/io/swagger/model/core/BatchSearchRequest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package io.swagger.model.core;
22

3-
import java.util.Objects;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import com.fasterxml.jackson.annotation.JsonSubTypes;
65
import com.fasterxml.jackson.annotation.JsonTypeInfo;
7-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
86
import io.swagger.model.SearchRequest;
7+
import io.swagger.model.geno.SampleSearchRequest;
98
import io.swagger.model.germ.GermplasmSearchRequest;
109

11-
import java.util.ArrayList;
12-
import java.util.List;
13-
import java.time.OffsetDateTime;
14-
1510
public class BatchSearchRequest extends SearchRequest {
1611
@JsonProperty("batchType")
1712
private BatchTypes batchType = null;
@@ -20,7 +15,9 @@ public class BatchSearchRequest extends SearchRequest {
2015
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXTERNAL_PROPERTY, property = "batchType")
2116
@JsonSubTypes({
2217
@JsonSubTypes.Type(value = GermplasmSearchRequest.class, name = "germplasm"),
23-
@JsonSubTypes.Type(value = ListSearchRequest.class, name = "lists")
18+
@JsonSubTypes.Type(value = ListSearchRequest.class, name = "lists"),
19+
@JsonSubTypes.Type(value = TrialSearchRequest.class, name = "trials"),
20+
@JsonSubTypes.Type(value = SampleSearchRequest.class, name = "samples")
2421
})
2522
private SearchRequest searchRequest = null;
2623

‎src/main/java/io/swagger/model/core/BatchTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public enum BatchTypes {
1414
SAMPLES("samples");
1515

1616

17-
private String value;
17+
private final String value;
1818

1919
BatchTypes(String value) {
2020
this.value = value;

‎src/main/java/io/swagger/model/germ/GermplasmSearchRequest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package io.swagger.model.germ;
22

3-
import java.util.Objects;
4-
53
import com.fasterxml.jackson.annotation.JsonIgnore;
64
import com.fasterxml.jackson.annotation.JsonProperty;
7-
8-
import com.fasterxml.jackson.annotation.JsonTypeName;
95
import io.swagger.model.SearchRequest;
6+
107
import java.util.ArrayList;
118
import java.util.List;
9+
import java.util.Objects;
1210

1311
public class GermplasmSearchRequest extends SearchRequest {
1412
@JsonProperty("accessionNumbers")

‎src/main/java/org/brapi/test/BrAPITestServer/controller/core/BatchesApiController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public ResponseEntity<? extends BrAPIResponse> batchesPost(@Valid @RequestBody B
113113
BrAPIComponent component = componentFactory.getComponent(batchType);
114114

115115
// Return the searchDbId with a 202 if the search is too in-depth with several parameters
116-
//String searchReqDbId = searchService.saveSearchRequest(body.getSearchRequest(), component.getSearchType());
117116
String searchReqDbId = searchService.saveSearchRequest(body, SearchRequestEntity.SearchRequestTypes.BATCHES);
118117
if (searchReqDbId != null) {
119118
return responseAccepted(searchReqDbId);

‎src/main/java/org/brapi/test/BrAPITestServer/controller/core/TrialsApiController.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11
package org.brapi.test.BrAPITestServer.controller.core;
22

3+
import io.swagger.api.core.TrialsApi;
34
import io.swagger.model.BrAPIResponse;
45
import io.swagger.model.Metadata;
5-
import io.swagger.model.core.Trial;
6-
import io.swagger.model.core.TrialListResponse;
7-
import io.swagger.model.core.TrialListResponseResult;
8-
import io.swagger.model.core.TrialNewRequest;
9-
import io.swagger.model.core.TrialSearchRequest;
10-
import io.swagger.model.core.TrialSingleResponse;
11-
import io.swagger.api.core.TrialsApi;
12-
6+
import io.swagger.model.core.*;
7+
import jakarta.validation.Valid;
138
import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
149
import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity;
1510
import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity.SearchRequestTypes;
1611
import org.brapi.test.BrAPITestServer.service.DateUtility;
1712
import org.brapi.test.BrAPITestServer.service.SearchService;
1813
import org.brapi.test.BrAPITestServer.service.core.TrialService;
14+
import org.hibernate.SessionFactory;
1915
import org.slf4j.Logger;
2016
import org.slf4j.LoggerFactory;
2117
import org.springframework.http.ResponseEntity;
2218
import org.springframework.stereotype.Controller;
23-
import org.springframework.web.bind.annotation.CrossOrigin;
24-
import org.springframework.web.bind.annotation.PathVariable;
25-
import org.springframework.web.bind.annotation.RequestBody;
26-
import org.springframework.web.bind.annotation.RequestHeader;
27-
import org.springframework.web.bind.annotation.RequestParam;
28-
import jakarta.validation.Valid;
19+
import org.springframework.web.bind.annotation.*;
20+
2921
import javax.servlet.http.HttpServletRequest;
3022
import java.util.List;
3123

@@ -38,13 +30,15 @@ public class TrialsApiController extends BrAPIController implements TrialsApi {
3830
private final HttpServletRequest request;
3931
private final TrialService trialService;
4032
private final SearchService searchService;
33+
private final SessionFactory sessionFactory;
4134

4235
@org.springframework.beans.factory.annotation.Autowired
43-
public TrialsApiController(TrialService trialService, SearchService searchService, HttpServletRequest request) {
36+
public TrialsApiController(TrialService trialService, SearchService searchService, HttpServletRequest request, SessionFactory sessionFactory) {
4437
this.trialService = trialService;
4538
this.searchService = searchService;
4639
this.request = request;
47-
}
40+
this.sessionFactory = sessionFactory;
41+
}
4842

4943
@CrossOrigin
5044
@Override

‎src/main/java/org/brapi/test/BrAPITestServer/factory/core/ListComponent.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package org.brapi.test.BrAPITestServer.factory.core;
22

3-
import io.swagger.model.BrAPIResponse;
4-
import io.swagger.model.BrAPIResponseResult;
53
import io.swagger.model.Metadata;
6-
import io.swagger.model.SearchRequest;
7-
import io.swagger.model.core.*;
4+
import io.swagger.model.core.BatchTypes;
5+
import io.swagger.model.core.ListSearchRequest;
6+
import io.swagger.model.core.ListSummary;
87
import jakarta.validation.Valid;
98
import org.brapi.test.BrAPITestServer.factory.BrAPIComponent;
109
import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity;
1110
import org.brapi.test.BrAPITestServer.service.core.ListService;
1211
import org.springframework.beans.factory.annotation.Autowired;
13-
import org.springframework.http.HttpStatus;
14-
import org.springframework.http.ResponseEntity;
1512
import org.springframework.stereotype.Component;
1613

1714
import java.util.List;

‎src/main/java/org/brapi/test/BrAPITestServer/factory/germ/GermplasmComponent.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
package org.brapi.test.BrAPITestServer.factory.germ;
22

3-
import com.fasterxml.jackson.core.JsonParser;
4-
import com.fasterxml.jackson.core.JsonProcessingException;
5-
import com.fasterxml.jackson.core.ObjectCodec;
6-
import com.fasterxml.jackson.databind.DeserializationContext;
7-
import com.fasterxml.jackson.databind.JsonDeserializer;
8-
import com.fasterxml.jackson.databind.JsonNode;
9-
import com.fasterxml.jackson.databind.ObjectMapper;
103
import io.swagger.model.Metadata;
11-
import io.swagger.model.SearchRequest;
12-
import io.swagger.model.core.BatchSearchRequest;
134
import io.swagger.model.core.BatchTypes;
145
import io.swagger.model.germ.Germplasm;
156
import io.swagger.model.germ.GermplasmSearchRequest;
167
import jakarta.validation.Valid;
17-
import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
188
import org.brapi.test.BrAPITestServer.factory.BrAPIComponent;
199
import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity;
2010
import org.brapi.test.BrAPITestServer.service.germ.GermplasmService;
2111
import org.springframework.beans.factory.annotation.Autowired;
22-
import org.springframework.http.HttpStatus;
2312
import org.springframework.stereotype.Component;
2413

25-
import java.io.IOException;
2614
import java.util.List;
2715
import java.util.stream.Collectors;
2816

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/BatchEntity.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import java.util.Date;
4-
import java.util.List;
5-
6-
import javax.persistence.*;
7-
83
import io.swagger.model.core.BatchTypes;
94
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
10-
import org.brapi.test.BrAPITestServer.model.entity.SearchRequestEntity.SearchRequestTypes;
5+
6+
import javax.persistence.*;
7+
import java.util.Date;
8+
import java.util.List;
119

1210
@Entity
1311
@Table(name = "batch")

‎src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/ListEntity.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
package org.brapi.test.BrAPITestServer.model.entity.core;
22

3-
import java.util.Date;
4-
import java.util.List;
5-
6-
import javax.persistence.*;
7-
8-
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
9-
103
import io.swagger.model.core.ListTypes;
11-
import org.hibernate.annotations.Filter;
12-
import org.hibernate.annotations.FilterDef;
13-
import org.hibernate.annotations.ParamDef;
4+
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
145
import org.hibernate.annotations.Where;
156

7+
import javax.persistence.*;
8+
import java.util.Date;
9+
import java.util.List;
10+
1611
@Entity
1712
@Table(name = "list")
1813
@Where(clause = "soft_deleted = false")

0 commit comments

Comments
 (0)