Remove invalid todo/comments for SPB version 3 usage, use default met…

…hod for addPreamble Related to #463
FirebirdSQL · Oct 2, 2021 · adc6bf4 · adc6bf4
1 parent 8265c55
commit adc6bf4
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 36 deletions.
diff --git a/src/main/org/firebirdsql/gds/impl/BlobParameterBufferImp.java b/src/main/org/firebirdsql/gds/impl/BlobParameterBufferImp.java
@@ -20,7 +20,6 @@
 
 import org.firebirdsql.gds.BlobParameterBuffer;
 import org.firebirdsql.gds.ISCConstants;
-import org.firebirdsql.gds.ParameterBuffer;
 import org.firebirdsql.gds.impl.argument.ArgumentType;
 
 /**
@@ -47,11 +46,6 @@ public final int getType() {
             return bpbVersion;
         }
 
-        @Override
-        public final void addPreamble(ParameterBuffer parameterBuffer) {
-            // Do nothing
-        }
-
         @Override
         public final ArgumentType getStringArgumentType(int tag) {
             return ArgumentType.TraditionalDpb;

diff --git a/src/main/org/firebirdsql/gds/impl/DatabaseParameterBufferImp.java b/src/main/org/firebirdsql/gds/impl/DatabaseParameterBufferImp.java
@@ -21,7 +21,6 @@
 import org.firebirdsql.encodings.Encoding;
 import org.firebirdsql.gds.DatabaseParameterBuffer;
 import org.firebirdsql.gds.ISCConstants;
-import org.firebirdsql.gds.ParameterBuffer;
 import org.firebirdsql.gds.ParameterTagMapping;
 import org.firebirdsql.gds.impl.argument.ArgumentType;
 
@@ -67,11 +66,6 @@ public final int getType() {
             return dpbVersion;
         }
 
-        @Override
-        public final void addPreamble(ParameterBuffer parameterBuffer) {
-            // Do nothing
-        }
-
         @Override
         public final ArgumentType getStringArgumentType(int tag) {
             return argumentType;

diff --git a/src/main/org/firebirdsql/gds/impl/ParameterBufferMetaData.java b/src/main/org/firebirdsql/gds/impl/ParameterBufferMetaData.java
@@ -45,7 +45,9 @@ public interface ParameterBufferMetaData {
      *
      * @param parameterBuffer Parameter buffer.
      */
-    void addPreamble(ParameterBuffer parameterBuffer);
+    default void addPreamble(ParameterBuffer parameterBuffer) {
+        // Do nothing
+    }
 
     /**
      * Gets the string argument type for the supplied tag.

diff --git a/src/main/org/firebirdsql/gds/impl/ServiceParameterBufferImp.java b/src/main/org/firebirdsql/gds/impl/ServiceParameterBufferImp.java
@@ -75,6 +75,7 @@ public ArgumentType getSingleArgumentType(int tag) {
                 return ArgumentType.TraditionalDpb;
             }
         },
+        // Technically this has nothing to do with SPB version 2/3
         SPB_VERSION_2(ISCConstants.isc_spb_current_version) {
             // TODO Check if correct and add additional types
             @Override
@@ -136,10 +137,5 @@ public ArgumentType getSingleArgumentType(int tag) {
         public final int getType() {
             return spbVersion;
         }
-
-        @Override
-        public void addPreamble(ParameterBuffer parameterBuffer) {
-            // Do nothing
-        }
     }
 }
diff --git a/src/main/org/firebirdsql/gds/impl/ServiceRequestBufferImp.java b/src/main/org/firebirdsql/gds/impl/ServiceRequestBufferImp.java
@@ -41,7 +41,7 @@ public void addArgument(int argumentType, byte value) {
     }
 
     public enum SrbMetaData implements ParameterBufferMetaData {
-        // TODO Add isc_spb_version3 as well?
+        // Technically this has nothing to do with SPB version 2/3
         SRB_VERSION_2(ISCConstants.isc_spb_current_version) {
             // TODO Check if correct and add additional types
             @Override
@@ -82,10 +82,5 @@ public ArgumentType getSingleArgumentType(int tag) {
         public final int getType() {
             return spbVersion;
         }
-
-        @Override
-        public void addPreamble(ParameterBuffer parameterBuffer) {
-            // Do nothing
-        }
     }
 }
diff --git a/src/main/org/firebirdsql/gds/impl/TransactionParameterBufferImpl.java b/src/main/org/firebirdsql/gds/impl/TransactionParameterBufferImpl.java
@@ -21,7 +21,6 @@
 package org.firebirdsql.gds.impl;
 
 import org.firebirdsql.gds.ISCConstants;
-import org.firebirdsql.gds.ParameterBuffer;
 import org.firebirdsql.gds.TransactionParameterBuffer;
 import org.firebirdsql.gds.impl.argument.ArgumentType;
 
@@ -57,11 +56,6 @@ public final int getType() {
             return tpbVersion;
         }
 
-        @Override
-        public final void addPreamble(ParameterBuffer parameterBuffer) {
-            // Do nothing
-        }
-
         @Override
         public final ArgumentType getStringArgumentType(int tag) {
             return ArgumentType.TraditionalDpb;

diff --git a/src/main/org/firebirdsql/gds/ng/wire/version13/Version13Descriptor.java b/src/main/org/firebirdsql/gds/ng/wire/version13/Version13Descriptor.java
@@ -65,15 +65,13 @@ public FbWireService createService(WireServiceConnection connection) {
     @Override
     public ServiceParameterBuffer createServiceParameterBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceParameterBufferImp(ServiceParameterBufferImp.SpbMetaData.SPB_VERSION_2,
                 stringEncoding);
     }
 
     @Override
     public ServiceRequestBuffer createServiceRequestBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceRequestBufferImp(ServiceRequestBufferImp.SrbMetaData.SRB_VERSION_2, stringEncoding);
     }
 

diff --git a/src/main/org/firebirdsql/gds/ng/wire/version15/Version15Descriptor.java b/src/main/org/firebirdsql/gds/ng/wire/version15/Version15Descriptor.java
@@ -67,15 +67,13 @@ public FbWireService createService(WireServiceConnection connection) {
     @Override
     public ServiceParameterBuffer createServiceParameterBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceParameterBufferImp(ServiceParameterBufferImp.SpbMetaData.SPB_VERSION_2,
                 stringEncoding);
     }
 
     @Override
     public ServiceRequestBuffer createServiceRequestBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceRequestBufferImp(ServiceRequestBufferImp.SrbMetaData.SRB_VERSION_2, stringEncoding);
     }
 

diff --git a/src/main/org/firebirdsql/gds/ng/wire/version16/Version16Descriptor.java b/src/main/org/firebirdsql/gds/ng/wire/version16/Version16Descriptor.java
@@ -67,15 +67,13 @@ public FbWireService createService(WireServiceConnection connection) {
     @Override
     public ServiceParameterBuffer createServiceParameterBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceParameterBufferImp(ServiceParameterBufferImp.SpbMetaData.SPB_VERSION_2,
                 stringEncoding);
     }
 
     @Override
     public ServiceRequestBuffer createServiceRequestBuffer(final WireServiceConnection connection) {
         final Encoding stringEncoding = connection.getEncodingFactory().getEncodingForFirebirdName("UTF8");
-        // TODO Version 3?
         return new ServiceRequestBufferImp(ServiceRequestBufferImp.SrbMetaData.SRB_VERSION_2, stringEncoding);
     }