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

Commit ab6ac80

Browse files
author
Chris Tucker
authored
Merge pull request #4 from plantbreeding/brapi-server-v2
[BI-998] Bring in additional info fix
2 parents ab1a0aa + 7bcd32c commit ab6ac80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+674
-378
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class ListBaseFields implements ListBaseFieldsInterface {
2020
@JsonProperty("additionalInfo")
2121
@Valid
22-
private Map<String, String> additionalInfo = null;
22+
private Map<String, Object> additionalInfo = null;
2323

2424
@JsonProperty("dateCreated")
2525
private OffsetDateTime dateCreated = null;
@@ -51,14 +51,14 @@ public class ListBaseFields implements ListBaseFieldsInterface {
5151
@JsonProperty("listType")
5252
private ListTypes listType = null;
5353

54-
public ListBaseFields additionalInfo(Map<String, String> additionalInfo) {
54+
public ListBaseFields additionalInfo(Map<String, Object> additionalInfo) {
5555
this.additionalInfo = additionalInfo;
5656
return this;
5757
}
5858

5959
public ListBaseFields putAdditionalInfoItem(String key, String additionalInfoItem) {
6060
if (this.additionalInfo == null) {
61-
this.additionalInfo = new HashMap<String, String>();
61+
this.additionalInfo = new HashMap<String, Object>();
6262
}
6363
this.additionalInfo.put(key, additionalInfoItem);
6464
return this;
@@ -70,11 +70,11 @@ public ListBaseFields putAdditionalInfoItem(String key, String additionalInfoIte
7070
**/
7171
@ApiModelProperty(example = "{}", value = "Additional arbitrary info")
7272

73-
public Map<String, String> getAdditionalInfo() {
73+
public Map<String, Object> getAdditionalInfo() {
7474
return additionalInfo;
7575
}
7676

77-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
77+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
7878
this.additionalInfo = additionalInfo;
7979
}
8080

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
public interface ListBaseFieldsInterface {
99

10-
public ListBaseFieldsInterface additionalInfo(Map<String, String> additionalInfo);
10+
public ListBaseFieldsInterface additionalInfo(Map<String, Object> additionalInfo);
1111

1212
public ListBaseFieldsInterface putAdditionalInfoItem(String key, String additionalInfoItem);
1313

14-
public Map<String, String> getAdditionalInfo();
14+
public Map<String, Object> getAdditionalInfo();
1515

16-
public void setAdditionalInfo(Map<String, String> additionalInfo);
16+
public void setAdditionalInfo(Map<String, Object> additionalInfo);
1717

1818
public ListBaseFieldsInterface dateCreated(OffsetDateTime dateCreated);
1919

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class LocationNewRequest {
2424

2525
@JsonProperty("additionalInfo")
2626
@Valid
27-
private Map<String, String> additionalInfo = null;
27+
private Map<String, Object> additionalInfo = null;
2828

2929
@JsonProperty("coordinateDescription")
3030
private String coordinateDescription = null;
@@ -93,14 +93,14 @@ public void setAbbreviation(String abbreviation) {
9393
this.abbreviation = abbreviation;
9494
}
9595

96-
public LocationNewRequest additionalInfo(Map<String, String> additionalInfo) {
96+
public LocationNewRequest additionalInfo(Map<String, Object> additionalInfo) {
9797
this.additionalInfo = additionalInfo;
9898
return this;
9999
}
100100

101101
public LocationNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
102102
if (this.additionalInfo == null) {
103-
this.additionalInfo = new HashMap<String, String>();
103+
this.additionalInfo = new HashMap<String, Object>();
104104
}
105105
this.additionalInfo.put(key, additionalInfoItem);
106106
return this;
@@ -112,11 +112,11 @@ public LocationNewRequest putAdditionalInfoItem(String key, String additionalInf
112112
**/
113113
@ApiModelProperty(example = "{}", value = "Additional arbitrary info")
114114

115-
public Map<String, String> getAdditionalInfo() {
115+
public Map<String, Object> getAdditionalInfo() {
116116
return additionalInfo;
117117
}
118118

119-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
119+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
120120
this.additionalInfo = additionalInfo;
121121
}
122122

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class PersonNewRequest {
2121
@JsonProperty("additionalInfo")
2222
@Valid
23-
private Map<String, String> additionalInfo = null;
23+
private Map<String, Object> additionalInfo = null;
2424

2525
@JsonProperty("description")
2626
private String description = null;
@@ -49,14 +49,14 @@ public class PersonNewRequest {
4949
@JsonProperty("userID")
5050
private String userID = null;
5151

52-
public PersonNewRequest additionalInfo(Map<String, String> additionalInfo) {
52+
public PersonNewRequest additionalInfo(Map<String, Object> additionalInfo) {
5353
this.additionalInfo = additionalInfo;
5454
return this;
5555
}
5656

5757
public PersonNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
5858
if (this.additionalInfo == null) {
59-
this.additionalInfo = new HashMap<String, String>();
59+
this.additionalInfo = new HashMap<String, Object>();
6060
}
6161
this.additionalInfo.put(key, additionalInfoItem);
6262
return this;
@@ -68,11 +68,11 @@ public PersonNewRequest putAdditionalInfoItem(String key, String additionalInfoI
6868
**/
6969
@ApiModelProperty(value = "Additional arbitrary info")
7070

71-
public Map<String, String> getAdditionalInfo() {
71+
public Map<String, Object> getAdditionalInfo() {
7272
return additionalInfo;
7373
}
7474

75-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
75+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
7676
this.additionalInfo = additionalInfo;
7777
}
7878

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Objects;
44
import com.fasterxml.jackson.annotation.JsonProperty;
5-
5+
import com.fasterxml.jackson.databind.JsonNode;
66

77
import io.swagger.annotations.ApiModelProperty;
88
import io.swagger.model.ExternalReferences;
@@ -23,7 +23,7 @@ public class ProgramNewRequest {
2323

2424
@JsonProperty("additionalInfo")
2525
@Valid
26-
private Map<String, String> additionalInfo = null;
26+
private Map<String, Object> additionalInfo = null;
2727

2828
@JsonProperty("commonCropName")
2929
private String commonCropName = null;
@@ -65,14 +65,14 @@ public void setAbbreviation(String abbreviation) {
6565
this.abbreviation = abbreviation;
6666
}
6767

68-
public ProgramNewRequest additionalInfo(Map<String, String> additionalInfo) {
68+
public ProgramNewRequest additionalInfo(Map<String, Object> additionalInfo) {
6969
this.additionalInfo = additionalInfo;
7070
return this;
7171
}
7272

7373
public ProgramNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
7474
if (this.additionalInfo == null) {
75-
this.additionalInfo = new HashMap<String, String>();
75+
this.additionalInfo = new HashMap<String, Object>();
7676
}
7777
this.additionalInfo.put(key, additionalInfoItem);
7878
return this;
@@ -84,11 +84,11 @@ public ProgramNewRequest putAdditionalInfoItem(String key, String additionalInfo
8484
**/
8585
@ApiModelProperty(value = "Additional arbitrary info")
8686

87-
public Map<String, String> getAdditionalInfo() {
87+
public Map<String, Object> getAdditionalInfo() {
8888
return additionalInfo;
8989
}
9090

91-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
91+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
9292
this.additionalInfo = additionalInfo;
9393
}
9494

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class StudyNewRequest {
2828

2929
@JsonProperty("additionalInfo")
3030
@Valid
31-
private Map<String, String> additionalInfo = null;
31+
private Map<String, Object> additionalInfo = null;
3232

3333
@JsonProperty("commonCropName")
3434
private String commonCropName = null;
@@ -129,14 +129,14 @@ public void setActive(Boolean active) {
129129
this.active = active;
130130
}
131131

132-
public StudyNewRequest additionalInfo(Map<String, String> additionalInfo) {
132+
public StudyNewRequest additionalInfo(Map<String, Object> additionalInfo) {
133133
this.additionalInfo = additionalInfo;
134134
return this;
135135
}
136136

137137
public StudyNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
138138
if (this.additionalInfo == null) {
139-
this.additionalInfo = new HashMap<String, String>();
139+
this.additionalInfo = new HashMap<String, Object>();
140140
}
141141
this.additionalInfo.put(key, additionalInfoItem);
142142
return this;
@@ -148,11 +148,11 @@ public StudyNewRequest putAdditionalInfoItem(String key, String additionalInfoIt
148148
**/
149149
@ApiModelProperty(value = "Additional arbitrary info")
150150

151-
public Map<String, String> getAdditionalInfo() {
151+
public Map<String, Object> getAdditionalInfo() {
152152
return additionalInfo;
153153
}
154154

155-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
155+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
156156
this.additionalInfo = additionalInfo;
157157
}
158158

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class TrialNewRequest {
2626

2727
@JsonProperty("additionalInfo")
2828
@Valid
29-
private Map<String, String> additionalInfo = null;
29+
private Map<String, Object> additionalInfo = null;
3030

3131
@JsonProperty("commonCropName")
3232
private String commonCropName = null;
@@ -89,14 +89,14 @@ public void setActive(Boolean active) {
8989
this.active = active;
9090
}
9191

92-
public TrialNewRequest additionalInfo(Map<String, String> additionalInfo) {
92+
public TrialNewRequest additionalInfo(Map<String, Object> additionalInfo) {
9393
this.additionalInfo = additionalInfo;
9494
return this;
9595
}
9696

9797
public TrialNewRequest putAdditionalInfoItem(String key, String additionalInfoItem) {
9898
if (this.additionalInfo == null) {
99-
this.additionalInfo = new HashMap<String, String>();
99+
this.additionalInfo = new HashMap<String, Object>();
100100
}
101101
this.additionalInfo.put(key, additionalInfoItem);
102102
return this;
@@ -108,11 +108,11 @@ public TrialNewRequest putAdditionalInfoItem(String key, String additionalInfoIt
108108
**/
109109
@ApiModelProperty(value = "Additional arbitrary info")
110110

111-
public Map<String, String> getAdditionalInfo() {
111+
public Map<String, Object> getAdditionalInfo() {
112112
return additionalInfo;
113113
}
114114

115-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
115+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
116116
this.additionalInfo = additionalInfo;
117117
}
118118

‎src/main/java/io/swagger/model/geno/Call.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public class Call {
2222
@JsonProperty("additionalInfo")
2323
@Valid
24-
private Map<String, String> additionalInfo = null;
24+
private Map<String, Object> additionalInfo = null;
2525

2626
@JsonProperty("callSetDbId")
2727
private String callSetDbId = null;
@@ -45,14 +45,14 @@ public class Call {
4545
@JsonProperty("variantName")
4646
private String variantName = null;
4747

48-
public Call additionalInfo(Map<String, String> additionalInfo) {
48+
public Call additionalInfo(Map<String, Object> additionalInfo) {
4949
this.additionalInfo = additionalInfo;
5050
return this;
5151
}
5252

5353
public Call putAdditionalInfoItem(String key, String additionalInfoItem) {
5454
if (this.additionalInfo == null) {
55-
this.additionalInfo = new HashMap<String, String>();
55+
this.additionalInfo = new HashMap<String, Object>();
5656
}
5757
this.additionalInfo.put(key, additionalInfoItem);
5858
return this;
@@ -64,11 +64,11 @@ public Call putAdditionalInfoItem(String key, String additionalInfoItem) {
6464
**/
6565
@ApiModelProperty(value = "Additional arbitrary info")
6666

67-
public Map<String, String> getAdditionalInfo() {
67+
public Map<String, Object> getAdditionalInfo() {
6868
return additionalInfo;
6969
}
7070

71-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
71+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
7272
this.additionalInfo = additionalInfo;
7373
}
7474

‎src/main/java/io/swagger/model/geno/CallSet.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class CallSet {
2323
@JsonProperty("additionalInfo")
2424
@Valid
25-
private Map<String, String> additionalInfo = null;
25+
private Map<String, Object> additionalInfo = null;
2626

2727
@JsonProperty("callSetDbId")
2828
private String callSetDbId = null;
@@ -46,14 +46,14 @@ public class CallSet {
4646
@Valid
4747
private List<String> variantSetIds = null;
4848

49-
public CallSet additionalInfo(Map<String, String> additionalInfo) {
49+
public CallSet additionalInfo(Map<String, Object> additionalInfo) {
5050
this.additionalInfo = additionalInfo;
5151
return this;
5252
}
5353

5454
public CallSet putAdditionalInfoItem(String key, String additionalInfoItem) {
5555
if (this.additionalInfo == null) {
56-
this.additionalInfo = new HashMap<String, String>();
56+
this.additionalInfo = new HashMap<String, Object>();
5757
}
5858
this.additionalInfo.put(key, additionalInfoItem);
5959
return this;
@@ -65,11 +65,11 @@ public CallSet putAdditionalInfoItem(String key, String additionalInfoItem) {
6565
**/
6666
@ApiModelProperty(value = "Additional arbitrary info")
6767

68-
public Map<String, String> getAdditionalInfo() {
68+
public Map<String, Object> getAdditionalInfo() {
6969
return additionalInfo;
7070
}
7171

72-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
72+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
7373
this.additionalInfo = additionalInfo;
7474
}
7575

‎src/main/java/io/swagger/model/geno/GenomeMap.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class GenomeMap {
2121
@JsonProperty("additionalInfo")
2222
@Valid
23-
private Map<String, String> additionalInfo = null;
23+
private Map<String, Object> additionalInfo = null;
2424

2525
@JsonProperty("comments")
2626
private String comments = null;
@@ -58,14 +58,14 @@ public class GenomeMap {
5858
@JsonProperty("unit")
5959
private String unit = null;
6060

61-
public GenomeMap additionalInfo(Map<String, String> additionalInfo) {
61+
public GenomeMap additionalInfo(Map<String, Object> additionalInfo) {
6262
this.additionalInfo = additionalInfo;
6363
return this;
6464
}
6565

6666
public GenomeMap putAdditionalInfoItem(String key, String additionalInfoItem) {
6767
if (this.additionalInfo == null) {
68-
this.additionalInfo = new HashMap<String, String>();
68+
this.additionalInfo = new HashMap<String, Object>();
6969
}
7070
this.additionalInfo.put(key, additionalInfoItem);
7171
return this;
@@ -77,11 +77,11 @@ public GenomeMap putAdditionalInfoItem(String key, String additionalInfoItem) {
7777
**/
7878
@ApiModelProperty(value = "Additional arbitrary info")
7979

80-
public Map<String, String> getAdditionalInfo() {
80+
public Map<String, Object> getAdditionalInfo() {
8181
return additionalInfo;
8282
}
8383

84-
public void setAdditionalInfo(Map<String, String> additionalInfo) {
84+
public void setAdditionalInfo(Map<String, Object> additionalInfo) {
8585
this.additionalInfo = additionalInfo;
8686
}
8787

0 commit comments

Comments
 (0)