Use the newly configurable paging support/size

Tirasa · Apr 18, 2024 · e39b711 · e39b711
1 parent 1bf2e5f
commit e39b711
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/net/tirasa/connid/bundles/ldap/search/LdapSearch.java b/src/main/java/net/tirasa/connid/bundles/ldap/search/LdapSearch.java
@@ -406,13 +406,13 @@ protected List<String> getBaseDNs() {
 
     protected LdapSearchStrategy getSearchStrategy() {
         LdapSearchStrategy result = conn.getConfiguration().newDefaultSearchStrategy(false);
-        if (options.getPageSize() != null) {
+        if (conn.getConfiguration().isUsePaging()) {
             if (conn.getConfiguration().isUseVlvControls() && conn.supportsControl(VirtualListViewControl.OID)) {
                 String vlvSortAttr = conn.getConfiguration().getVlvSortAttribute();
-                result = new VlvIndexSearchStrategy(vlvSortAttr, options.getPageSize());
+                result = new VlvIndexSearchStrategy(vlvSortAttr, conn.getConfiguration().getPageSize());
             } else if (conn.supportsControl(PagedResultsControl.OID)) {
                 result = new PagedSearchStrategy(
-                        options.getPageSize(),
+                        conn.getConfiguration().getPageSize(),
                         options.getPagedResultsCookie(),
                         options.getPagedResultsOffset(),
                         handler instanceof SearchResultsHandler ? (SearchResultsHandler) handler : null,

diff --git a/src/main/java/net/tirasa/connid/bundles/ldap/search/LdapSearchStrategy.java b/src/main/java/net/tirasa/connid/bundles/ldap/search/LdapSearchStrategy.java
@@ -75,7 +75,7 @@ protected static String searchControlsToString(final SearchControls controls) {
 
     public static Class<? extends LdapSearchStrategy> getSearchStrategy(LdapConnection conn, OperationOptions options) {
         Class<? extends LdapSearchStrategy> clazz = DefaultSearchStrategy.class;
-        if (options.getPageSize() != null) {
+        if (conn.getConfiguration().isUsePaging()) {
             if (conn.getConfiguration().isUseVlvControls() && conn.supportsControl(VirtualListViewControl.OID)) {
                 clazz = VlvIndexSearchStrategy.class;
             } else if (conn.supportsControl(PagedResultsControl.OID)) {