Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 145 #207

Merged
merged 4 commits into from
Oct 27, 2023
Merged

Issue 145 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2547f14
fixes issues #71, #72, #73, #74, #137, #138, #104, #105, #106, #107, …
BrapiCoordinatorSelby Aug 16, 2023
1960393
unit tests pass
BrapiCoordinatorSelby Aug 16, 2023
5b4427e
fixes #145, #146, #163, #164, #165, #166, #96, #97, #98, #99. Depende…
BrapiCoordinatorSelby Aug 18, 2023
e762c89
Merge branch 'develop-2.1' into issue-145
BrapiCoordinatorSelby Aug 18, 2023
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
29 changes: 28 additions & 1 deletion ...java-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ListQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,36 @@
public class ListQueryParams extends BrAPIQueryParams {

private BrAPIListTypes listType;
private String commonCropName;
private String programDbId;
private String listName;
private String listDbId;
private String listSource;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
27 changes: 26 additions & 1 deletion ...-client/src/main/java/org/brapi/client/v2/model/queryParams/core/LocationQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,32 @@ public class LocationQueryParams extends BrAPIQueryParams {

private String locationType;
private String locationDbId;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}

}
27 changes: 26 additions & 1 deletion ...va-client/src/main/java/org/brapi/client/v2/model/queryParams/core/PeopleQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,32 @@ public class PeopleQueryParams extends BrAPIQueryParams {
private String lastName;
private String personDbId;
private String userID;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}

}
27 changes: 26 additions & 1 deletion ...a-client/src/main/java/org/brapi/client/v2/model/queryParams/core/ProgramQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,31 @@ public class ProgramQueryParams extends BrAPIQueryParams {
private String programDbId;
private String programName;
private String abbreviation;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
1 change: 1 addition & 0 deletions ...va-client/src/main/java/org/brapi/client/v2/model/queryParams/core/SeasonQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class SeasonQueryParams extends BrAPIQueryParams {

private String seasonDbId;
private String season;
private String seasonName;
private String year;

}
27 changes: 26 additions & 1 deletion ...ava-client/src/main/java/org/brapi/client/v2/model/queryParams/core/StudyQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,31 @@ public class StudyQueryParams extends BrAPIQueryParams {
private String active;
private String sortBy;
private String sortOrder;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
27 changes: 26 additions & 1 deletion ...ava-client/src/main/java/org/brapi/client/v2/model/queryParams/core/TrialQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,31 @@ public class TrialQueryParams extends BrAPIQueryParams {
private String trialPUI;
private String sortBy;
private String sortOrder;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
27 changes: 26 additions & 1 deletion ...lient/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,31 @@ public class CrossQueryParams extends BrAPIQueryParams {

private String crossingProjectDbId;
private String crossDbId;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
27 changes: 26 additions & 1 deletion ...main/java/org/brapi/client/v2/model/queryParams/germplasm/CrossingProjectQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,31 @@
public class CrossingProjectQueryParams extends BrAPIQueryParams {

private String crossingProjectDbId;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}
}
41 changes: 40 additions & 1 deletion ...n/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,47 @@ public class GermplasmAttributeQueryParams extends BrAPIQueryParams {
private String attributeCategory;
private String attributeDbId;
private String attributeName;
private String attributePUI;
private String commonCropName;
private String externalReferenceSource;
private String germplasmDbId;
private String methodDbId;
private String methodName;
private String methodPUI;
private String programDbId;
private String scaleDbId;
private String scaleName;
private String scalePUI;
private String traitDbId;
private String traitName;
private String traitPUI;


private String externalReferenceId;
@Deprecated
private String externalReferenceID;
private String externalReferenceSource;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}

}
27 changes: 26 additions & 1 deletion ...a/org/brapi/client/v2/model/queryParams/germplasm/GermplasmAttributeValueQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,32 @@ public class GermplasmAttributeValueQueryParams extends BrAPIQueryParams {
private String attributeDbId;
private String attributeName;
private String germplasmDbId;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}

}
27 changes: 26 additions & 1 deletion ...t/src/main/java/org/brapi/client/v2/model/queryParams/germplasm/GermplasmQueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,32 @@ public class GermplasmQueryParams extends BrAPIQueryParams {
private String synonym;
private String parentDbId;
private String progenyDbId;
private String externalReferenceID;
private String externalReferenceSource;
private String externalReferenceId;
@Deprecated
private String externalReferenceID;

public String getExternalReferenceId() {
return externalReferenceId;
}
public String externalReferenceId() {
return externalReferenceId;
}
public void setExternalReferenceId(String externalReferenceId) {
this.externalReferenceId = externalReferenceId;
}

@Deprecated
public String getExternalReferenceID() {
return externalReferenceID;
}
@Deprecated
public String externalReferenceID() {
return externalReferenceID;
}
@Deprecated
public void setExternalReferenceID(String externalReferenceID) {
this.externalReferenceID = externalReferenceID;
}

}
Loading