|
8 | 8 | import com.fasterxml.jackson.databind.ObjectMapper;
|
9 | 9 | import com.fasterxml.jackson.databind.SerializationFeature;
|
10 | 10 | import com.fasterxml.jackson.databind.util.StdDateFormat;
|
11 |
| -import com.sun.istack.internal.NotNull; |
12 |
| -import com.sun.istack.internal.Nullable; |
13 | 11 | import org.asynchttpclient.AsyncCompletionHandler;
|
14 | 12 | import org.asynchttpclient.AsyncHttpClient;
|
15 | 13 | import org.asynchttpclient.DefaultAsyncHttpClient;
|
@@ -1744,13 +1742,13 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> type
|
1744 | 1742 | * @param Class<?> type of search entity like Ticket, User etc
|
1745 | 1743 | * @param Class<T> page return type to which the search result will be deserialized
|
1746 | 1744 | */
|
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 |
1754 | 1752 | ) {
|
1755 | 1753 |
|
1756 | 1754 | String typeName = getTypeName(searchType);
|
@@ -1783,13 +1781,13 @@ public <T> Optional<T> getSearchPageResults(
|
1783 | 1781 | * @param String name of any field of the searchType
|
1784 | 1782 | * @param SortOrder
|
1785 | 1783 | */
|
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) { |
1791 | 1789 |
|
1792 |
| - return getSearchPageResults(query, queryParams, sortBy, sortOrder, Ticket.class, TicketPage.class); |
| 1790 | + return getSearchResults(Ticket.class, TicketPage.class, query, queryParams, sortBy, sortOrder); |
1793 | 1791 | }
|
1794 | 1792 |
|
1795 | 1793 | public void notifyApp(String json) {
|
@@ -2945,7 +2943,7 @@ private static List<String> statusArray(Status... statuses) {
|
2945 | 2943 | return result;
|
2946 | 2944 | }
|
2947 | 2945 |
|
2948 |
| - private static String getTypeName(@NotNull final Class<?> type) { |
| 2946 | + private static String getTypeName(final Class<?> type) { |
2949 | 2947 | String typeName = null;
|
2950 | 2948 | for (final Map.Entry<String, Class<? extends SearchResultEntity>> entry : searchResultTypes.entrySet()) {
|
2951 | 2949 | if (type.equals(entry.getValue())) {
|
|
0 commit comments