diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryDelimitedSerialization.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryDelimitedSerialization.java
index 698b054166f6..3dbf42b4a282 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryDelimitedSerialization.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryDelimitedSerialization.java
@@ -6,12 +6,13 @@
 /**
  * Defines the input or output delimited (CSV) serialization for a blob quick query request.
  */
-public class FileQueryDelimitedSerialization extends FileQuerySerialization {
+public class FileQueryDelimitedSerialization implements FileQuerySerialization {
 
     private char columnSeparator;
     private char fieldQuote;
     private char escapeChar;
     private boolean headersPresent;
+    private char recordSeparator;
 
     /**
      * Gets the column separator.
@@ -85,9 +86,22 @@ public FileQueryDelimitedSerialization setHeadersPresent(boolean headersPresent)
         return this;
     }
 
-    @Override
+    /**
+     * Gets the record separator.
+     *
+     * @return the record separator.
+     */
+    public char getRecordSeparator() {
+        return recordSeparator;
+    }
+
+    /**
+     * Sets the record separator.
+     * @param recordSeparator the record separator.
+     * @return the updated FileQueryDelimitedSerialization object.
+     */
     public FileQueryDelimitedSerialization setRecordSeparator(char recordSeparator) {
-        super.setRecordSeparator(recordSeparator);
+        this.recordSeparator = recordSeparator;
         return this;
     }
 }
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryJsonSerialization.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryJsonSerialization.java
index c0696c6f1062..a1f4370207af 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryJsonSerialization.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQueryJsonSerialization.java
@@ -6,11 +6,26 @@
 /**
  * Defines the input or output JSON serialization for a file query request.
  */
-public class FileQueryJsonSerialization extends FileQuerySerialization {
+public class FileQueryJsonSerialization implements FileQuerySerialization {
 
-    @Override
+    private char recordSeparator;
+
+    /**
+     * Gets the record separator.
+     *
+     * @return the record separator.
+     */
+    public char getRecordSeparator() {
+        return recordSeparator;
+    }
+
+    /**
+     * Sets the record separator.
+     * @param recordSeparator the record separator.
+     * @return the updated FileQueryJsonSerialization object.
+     */
     public FileQueryJsonSerialization setRecordSeparator(char recordSeparator) {
-        super.setRecordSeparator(recordSeparator);
+        this.recordSeparator = recordSeparator;
         return this;
     }
 }
diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
index ab4db02ce700..045f9ebe56e6 100644
--- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
+++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/FileQuerySerialization.java
@@ -7,26 +7,5 @@
  * Defines the input and output serialization for a file query request.
  * either {@link FileQueryJsonSerialization} or {@link FileQueryDelimitedSerialization}
  */
-public abstract class FileQuerySerialization {
-
-    private char recordSeparator;
-
-    /**
-     * Gets the record separator.
-     *
-     * @return the record separator.
-     */
-    public char getRecordSeparator() {
-        return recordSeparator;
-    }
-
-    /**
-     * Sets the record separator.
-     * @param recordSeparator the record separator.
-     * @return the updated FileQuerySerialization object.
-     */
-    public FileQuerySerialization setRecordSeparator(char recordSeparator) {
-        this.recordSeparator = recordSeparator;
-        return this;
-    }
+public interface FileQuerySerialization {
 }
diff --git a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
index b5ef47b17116..9e533dd0cc19 100644
--- a/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
+++ b/sdk/storage/azure-storage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileAPITest.groovy
@@ -3373,11 +3373,6 @@ class FileAPITest extends APISpec {
         }
     }
 
-    class RandomOtherSerialization extends FileQuerySerialization {
-        @Override
-        public RandomOtherSerialization setRecordSeparator(char recordSeparator) {
-            this.recordSeparator = recordSeparator;
-            return this;
-        }
+    class RandomOtherSerialization implements FileQuerySerialization {
     }
 }