Fix rebase errors

Author: jduo

java/client/src/main/java/glide/api/commands/GenericBaseCommands.java

@@ -1207,7 +1207,4 @@ CompletableFuture<String> restore(
      * }</pre>
      */
     CompletableFuture<Long> sortStore(String key, String destination);
-    CompletableFuture<Object[]> sscan(String key, long cursor);
-
-    CompletableFuture<Object[]> sscan(String key, long cursor, ScanOptions scanOptions);
 }

java/integTest/src/test/java/glide/SharedCommandTests.java

@@ -7285,7 +7285,7 @@ public void zscan(BaseClient client) {
 
         // Test match pattern
         result =
-                client.zscan(key1, initialCursor, ZScanOptions.builder().matchPattern("*").busild()).get();
+                client.zscan(key1, initialCursor, ZScanOptions.builder().matchPattern("*").build()).get();
         assertTrue(Long.parseLong(result[resultCursorIndex].toString()) >= 0);
         assertTrue(ArrayUtils.getLength(result[resultCollectionIndex]) >= defaultCount);