Skip to content

Commit 28e63b6

Browse files
authored
Merge pull request #412 from aheritier/cleanup
Build and release cleanup
2 parents 566d2cf + 9184362 commit 28e63b6

File tree

5 files changed

+14
-48
lines changed

5 files changed

+14
-48
lines changed

.github/workflows/ci-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
distribution: 'adopt'
2424
java-version: 8
2525
- name: Build with Maven
26-
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage
26+
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
ZENDESK_JAVA_CLIENT_TEST_URL: ${{ secrets.ZENDESK_JAVA_CLIENT_TEST_URL }}

.github/workflows/ci-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
distribution: 'adopt'
2424
java-version: 8
2525
- name: Build with Maven
26-
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage
26+
run: mvn --show-version --no-transfer-progress verify --file pom.xml -Pcoverage,cloudbees-oss-release -Dgpg.skip=true
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

Jenkinsfile

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/org/zendesk/client/v2/Zendesk.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
import org.zendesk.client.v2.model.hc.Article;
6161
import org.zendesk.client.v2.model.hc.ArticleAttachments;
6262
import org.zendesk.client.v2.model.hc.Category;
63+
import org.zendesk.client.v2.model.hc.PermissionGroup;
6364
import org.zendesk.client.v2.model.hc.Section;
6465
import org.zendesk.client.v2.model.hc.Subscription;
6566
import org.zendesk.client.v2.model.hc.Translation;
66-
import org.zendesk.client.v2.model.hc.PermissionGroup;
6767
import org.zendesk.client.v2.model.hc.UserSegment;
6868
import org.zendesk.client.v2.model.schedules.Holiday;
6969
import org.zendesk.client.v2.model.schedules.Schedule;
@@ -1754,13 +1754,13 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> type
17541754

17551755
/**
17561756
* Search API implementation with pagination support.
1757-
*
1758-
* @param String query string used filter a type given by searchType
1759-
* @param Map<String, Object> additional parameters other than filter string like per_page, page etc
1760-
* @param String name of any field of the searchType
1761-
* @param SortOrder
1762-
* @param Class<?> type of search entity like Ticket, User etc
1763-
* @param Class<T> page return type to which the search result will be deserialized
1757+
*
1758+
* @param searchType type of search entity like Ticket, User etc
1759+
* @param pageType page return type to which the search result will be deserialized
1760+
* @param query string used filter a type given by searchType
1761+
* @param queryParams additional parameters other than filter string like per_page, page etc
1762+
* @param sortBy name of any field of the searchType
1763+
* @param sortOrder sort order
17641764
*/
17651765
public <T> Optional<T> getSearchResults(
17661766
final Class<?> searchType,
@@ -1796,10 +1796,10 @@ public <T> Optional<T> getSearchResults(
17961796
/**
17971797
* Ticket Search API implementation with pagination support.
17981798
*
1799-
* @param String query string used filter a type given by searchType
1800-
* @param Map<String, Object> additional parameters other than filter string like per_page, page etc
1801-
* @param String name of any field of the searchType
1802-
* @param SortOrder
1799+
* @param query string used filter a type given by searchType
1800+
* @param queryParams additional parameters other than filter string like per_page, page etc
1801+
* @param sortBy name of any field of the searchType
1802+
* @param sortOrder sort order
18031803
*/
18041804
public Optional<TicketPage> getSearchTicketResults(
18051805
final String query,

0 commit comments

Comments
 (0)