Skip to content

Commit cade7a7

Browse files
author
Naveen Reddy Alka
committed
refactor(Zendesk): remove usage of internal NotNull/Nullable and rename methods
1 parent 84d8ec2 commit cade7a7

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import com.fasterxml.jackson.databind.ObjectMapper;
99
import com.fasterxml.jackson.databind.SerializationFeature;
1010
import com.fasterxml.jackson.databind.util.StdDateFormat;
11-
import com.sun.istack.internal.NotNull;
12-
import com.sun.istack.internal.Nullable;
1311
import org.asynchttpclient.AsyncCompletionHandler;
1412
import org.asynchttpclient.AsyncHttpClient;
1513
import org.asynchttpclient.DefaultAsyncHttpClient;
@@ -1744,13 +1742,13 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> type
17441742
* @param Class<?> type of search entity like Ticket, User etc
17451743
* @param Class<T> page return type to which the search result will be deserialized
17461744
*/
1747-
public <T> Optional<T> getSearchPageResults(
1748-
@NotNull final String query,
1749-
@Nullable final Map<String, Object> queryParams,
1750-
@Nullable final String sortBy,
1751-
@Nullable final SortOrder sortOrder,
1752-
@NotNull final Class<?> searchType,
1753-
@NotNull final Class<T> pageType
1745+
public <T> Optional<T> getSearchResults(
1746+
final Class<?> searchType,
1747+
final Class<T> pageType,
1748+
final String query,
1749+
final Map<String, Object> queryParams,
1750+
final String sortBy,
1751+
final SortOrder sortOrder
17541752
) {
17551753

17561754
String typeName = getTypeName(searchType);
@@ -1783,13 +1781,13 @@ public <T> Optional<T> getSearchPageResults(
17831781
* @param String name of any field of the searchType
17841782
* @param SortOrder
17851783
*/
1786-
public Optional<TicketPage> getSearchTicketPageResults(
1787-
@NotNull final String query,
1788-
@Nullable final Map<String, Object> queryParams,
1789-
@Nullable final String sortBy,
1790-
@Nullable final SortOrder sortOrder) {
1784+
public Optional<TicketPage> getSearchTicketResults(
1785+
final String query,
1786+
final Map<String, Object> queryParams,
1787+
final String sortBy,
1788+
final SortOrder sortOrder) {
17911789

1792-
return getSearchPageResults(query, queryParams, sortBy, sortOrder, Ticket.class, TicketPage.class);
1790+
return getSearchResults(Ticket.class, TicketPage.class, query, queryParams, sortBy, sortOrder);
17931791
}
17941792

17951793
public void notifyApp(String json) {
@@ -2945,7 +2943,7 @@ private static List<String> statusArray(Status... statuses) {
29452943
return result;
29462944
}
29472945

2948-
private static String getTypeName(@NotNull final Class<?> type) {
2946+
private static String getTypeName(final Class<?> type) {
29492947
String typeName = null;
29502948
for (final Map.Entry<String, Class<? extends SearchResultEntity>> entry : searchResultTypes.entrySet()) {
29512949
if (type.equals(entry.getValue())) {

0 commit comments

Comments
 (0)