Skip to content
This repository has been archived by the owner on Jun 3, 2020. It is now read-only.

Commit

Permalink
fix issue #2
Browse files Browse the repository at this point in the history
  • Loading branch information
0312birdzhang committed Apr 25, 2017
1 parent 16eb92d commit 66849d7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ build/classes
build/test-results
build/tmp
build/*
.settings
/build/
/bin/
/target/
.gitignore
/build.gradle
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jar.libsDir = './lib'

group = "com.github.0312birdzhang"
archivesBaseName = "Zabbix4j"
version = '0.1.8'
version = '0.1.9'

repositories {
mavenCentral()
Expand Down
27 changes: 17 additions & 10 deletions src/main/java/com/zabbix4j/GetRequestCommonParams.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class GetRequestCommonParams {
private Map<String, String> search;
private Boolean searchByAny;
private Boolean searchWildcardsEnabled;
private List<SortOrder> sortorder;
private List<String> sortorder;
private Boolean startSearch;
private Integer limitSelects;
private List<String> sortfield;
Expand Down Expand Up @@ -198,11 +198,11 @@ public void setSortfield(List<String> sortfield) {
this.sortfield = sortfield;
}

public List<SortOrder> getSortorder() {
public List<String> getSortorder() {
return sortorder;
}

public void setSortorder(List<SortOrder> sortorder) {
public void setSortorder(List<String> sortorder) {
this.sortorder = sortorder;
}

Expand All @@ -216,10 +216,10 @@ public void setSearch(Map<String, String> search) {
this.search = search;
}

public void setSortOrder(SortOrder order) {
/* public void setSortOrder(SortOrder order) {
sortorder = ZbxListUtils.add(sortorder, order);
}
}*/

public Boolean getStartSearch() {
return startSearch;
Expand All @@ -229,12 +229,19 @@ public void setStartSearch(Boolean startSearch) {
this.startSearch = startSearch;
}

public class SortOrder {
/* public static class SortOrder {
private String sortfield;
private String order;

private SortOrder() {
private String sortorder;
public SortOrder() {
}
public String getSortorder() {
return sortorder;
}
public void setSortorder(String sortorder) {
this.sortorder = sortorder;
}
public String getSortfield() {
return sortfield;
Expand All @@ -243,7 +250,7 @@ public String getSortfield() {
public void setSortfield(String sortfield) {
this.sortfield = sortfield;
}
}
}*/

}

0 comments on commit 66849d7

Please sign in to comment.