Remove deprecated ConnectorPageSource.getNextPage

Author: ebyhr

core/trino-main/src/test/java/io/trino/connector/MockConnectorPageSource.java

@@ -13,7 +13,6 @@
  */
 package io.trino.connector;
 
-import io.trino.spi.Page;
 import io.trino.spi.connector.ConnectorPageSource;
 import io.trino.spi.connector.SourcePage;
 import io.trino.spi.metrics.Metrics;
@@ -60,13 +59,6 @@ public boolean isFinished()
         return delegate.isFinished();
     }
 
-    @Override
-    @SuppressWarnings("removal")
-    public Page getNextPage()
-    {
-        return delegate.getNextPage();
-    }
-
     @Override
     public SourcePage getNextSourcePage()
     {

core/trino-spi/pom.xml

@@ -662,6 +662,24 @@
                                     <code>java.annotation.removed</code>
                                     <annotationType>io.trino.spi.Experimental</annotationType>
                                 </item>
+                                <item>
+                                    <ignore>true</ignore>
+                                    <code>java.method.removed</code>
+                                    <old>method io.trino.spi.Page io.trino.spi.connector.EmptyPageSource::getNextPage()</old>
+                                    <justification>Deprecated</justification>
+                                </item>
+                                <item>
+                                    <ignore>true</ignore>
+                                    <code>java.method.removed</code>
+                                    <old>method io.trino.spi.Page io.trino.spi.connector.FixedPageSource::getNextPage()</old>
+                                    <justification>Deprecated</justification>
+                                </item>
+                                <item>
+                                    <ignore>true</ignore>
+                                    <code>java.method.removed</code>
+                                    <old>method io.trino.spi.Page io.trino.spi.connector.RecordPageSource::getNextPage()</old>
+                                    <justification>Deprecated</justification>
+                                </item>
                             </differences>
                         </revapi.differences>
                     </analysisConfiguration>

core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorPageSource.java

@@ -13,7 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Page;
 import io.trino.spi.metrics.Metrics;
 
 import java.io.Closeable;
@@ -53,27 +52,12 @@ default OptionalLong getCompletedPositions()
      */
     boolean isFinished();
 
-    /**
-     * Gets the next page of data.  This method is allowed to return null.
-     *
-     * @deprecated Use {@link #getNextSourcePage()} instead
-     */
-    @Deprecated(forRemoval = true)
-    default Page getNextPage()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Gets the next page of data. This method is allowed to return null.
      */
     default SourcePage getNextSourcePage()
     {
-        Page nextPage = getNextPage();
-        if (nextPage == null) {
-            return null;
-        }
-        return SourcePage.create(nextPage);
+        throw new UnsupportedOperationException();
     }
 
     /**

core/trino-spi/src/main/java/io/trino/spi/connector/EmptyPageSource.java

@@ -13,8 +13,6 @@
  */
 package io.trino.spi.connector;
 
-import io.trino.spi.Page;
-
 public class EmptyPageSource
         implements ConnectorPageSource
 {
@@ -36,13 +34,6 @@ public boolean isFinished()
         return true;
     }
 
-    @Override
-    @SuppressWarnings("removal")
-    public Page getNextPage()
-    {
-        return null;
-    }
-
     @Override
     public SourcePage getNextSourcePage()
     {

core/trino-spi/src/main/java/io/trino/spi/connector/FixedPageSource.java

@@ -74,15 +74,14 @@ public boolean isFinished()
     }
 
     @Override
-    @SuppressWarnings("removal")
-    public Page getNextPage()
+    public SourcePage getNextSourcePage()
     {
         if (isFinished()) {
             return null;
         }
         Page page = pages.next();
         completedBytes += page.getSizeInBytes();
-        return page;
+        return SourcePage.create(page);
     }
 
     @Override

core/trino-spi/src/main/java/io/trino/spi/connector/RecordPageSource.java

@@ -81,8 +81,7 @@ public boolean isFinished()
     }
 
     @Override
-    @SuppressWarnings("removal")
-    public Page getNextPage()
+    public SourcePage getNextSourcePage()
     {
         if (!closed) {
             for (int i = 0; i < ROWS_PER_REQUEST && !pageBuilder.isFull(); i++) {
@@ -125,7 +124,7 @@ else if (javaType == Slice.class) {
         if ((closed && !pageBuilder.isEmpty()) || pageBuilder.isFull()) {
             Page page = pageBuilder.build();
             pageBuilder.reset();
-            return page;
+            return SourcePage.create(page);
         }
 
         return null;