You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/05/25 10:10:29 UTC
[shardingsphere] branch master updated: Remove generic type of DatabaseProtocolFrontendEngine (#25887)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 35c5d87d246 Remove generic type of DatabaseProtocolFrontendEngine (#25887)
35c5d87d246 is described below
commit 35c5d87d246ab5f06dbdd96bf27a919a10afa834
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu May 25 18:10:19 2023 +0800
Remove generic type of DatabaseProtocolFrontendEngine (#25887)
* Remove generic type of QueryCommandExecutor
* Remove generic type of DatabaseProtocolFrontendEngine
---
.../db/protocol/codec/DatabasePacketCodecEngine.java | 6 ++----
.../protocol/mysql/codec/MySQLPacketCodecEngine.java | 6 +++---
.../opengauss/codec/OpenGaussPacketCodecEngine.java | 18 +++++++++---------
.../postgresql/codec/PostgreSQLPacketCodecEngine.java | 18 +++++++++---------
.../fixture/DatabaseProtocolFrontendEngineFixture.java | 5 ++---
.../command/executor/QueryCommandExecutor.java | 6 ++----
.../frontend/spi/DatabaseProtocolFrontendEngine.java | 9 +++------
.../proxy/frontend/mysql/MySQLFrontendEngine.java | 5 ++---
.../binary/execute/MySQLComStmtExecuteExecutor.java | 2 +-
.../query/text/query/MySQLComQueryPacketExecutor.java | 2 +-
.../frontend/opengauss/OpenGaussFrontendEngine.java | 3 +--
.../query/simple/OpenGaussComQueryExecutor.java | 2 +-
.../frontend/postgresql/PostgreSQLFrontendEngine.java | 5 ++---
.../query/simple/PostgreSQLComQueryExecutor.java | 2 +-
14 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/DatabasePacketCodecEngine.java b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/DatabasePacketCodecEngine.java
index 8852ecc7816..32e80717e27 100644
--- a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/DatabasePacketCodecEngine.java
+++ b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/codec/DatabasePacketCodecEngine.java
@@ -27,10 +27,8 @@ import java.util.List;
/**
* Database packet codec engine.
- *
- * @param <T> type of database packet
*/
-public interface DatabasePacketCodecEngine<T extends DatabasePacket> {
+public interface DatabasePacketCodecEngine {
/**
* Judge is valid header or not.
@@ -56,7 +54,7 @@ public interface DatabasePacketCodecEngine<T extends DatabasePacket> {
* @param message message of database packet
* @param out output
*/
- void encode(ChannelHandlerContext context, T message, ByteBuf out);
+ void encode(ChannelHandlerContext context, DatabasePacket message, ByteBuf out);
/**
* Create packet payload.
diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
index f2d412c1fe3..b27ea44a13e 100644
--- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
+++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
@@ -23,9 +23,9 @@ import io.netty.channel.ChannelHandlerContext;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLConstants;
-import org.apache.shardingsphere.db.protocol.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLErrPacket;
import org.apache.shardingsphere.db.protocol.mysql.payload.MySQLPacketPayload;
+import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnknownSQLException;
import java.nio.charset.Charset;
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Database packet codec for MySQL.
*/
-public final class MySQLPacketCodecEngine implements DatabasePacketCodecEngine<MySQLPacket> {
+public final class MySQLPacketCodecEngine implements DatabasePacketCodecEngine {
private static final int MAX_PACKET_LENGTH = 0xFFFFFF;
@@ -87,7 +87,7 @@ public final class MySQLPacketCodecEngine implements DatabasePacketCodecEngine<M
}
@Override
- public void encode(final ChannelHandlerContext context, final MySQLPacket message, final ByteBuf out) {
+ public void encode(final ChannelHandlerContext context, final DatabasePacket message, final ByteBuf out) {
MySQLPacketPayload payload = new MySQLPacketPayload(prepareMessageHeader(out).markWriterIndex(), context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get());
try {
message.write(payload);
diff --git a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java
index a614dc4bbcc..f617ec752d1 100644
--- a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java
+++ b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java
@@ -20,17 +20,17 @@ package org.apache.shardingsphere.db.protocol.opengauss.codec;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.CompositeByteBuf;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
+import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
import org.apache.shardingsphere.db.protocol.opengauss.packet.command.OpenGaussCommandPacketType;
import org.apache.shardingsphere.db.protocol.opengauss.packet.command.generic.OpenGaussErrorResponsePacket;
import org.apache.shardingsphere.db.protocol.packet.CommandPacketType;
-import org.apache.shardingsphere.dialect.postgresql.vendor.PostgreSQLVendorError;
+import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.db.protocol.postgresql.constant.PostgreSQLMessageSeverityLevel;
-import org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacketType;
import org.apache.shardingsphere.db.protocol.postgresql.packet.identifier.PostgreSQLIdentifierPacket;
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
+import org.apache.shardingsphere.dialect.postgresql.vendor.PostgreSQLVendorError;
import java.nio.charset.Charset;
import java.util.LinkedList;
@@ -39,7 +39,7 @@ import java.util.List;
/**
* Database packet codec for openGauss.
*/
-public final class OpenGaussPacketCodecEngine implements DatabasePacketCodecEngine<PostgreSQLPacket> {
+public final class OpenGaussPacketCodecEngine implements DatabasePacketCodecEngine {
private static final int SSL_REQUEST_PAYLOAD_LENGTH = 8;
@@ -106,9 +106,9 @@ public final class OpenGaussPacketCodecEngine implements DatabasePacketCodecEngi
}
@Override
- public void encode(final ChannelHandlerContext context, final PostgreSQLPacket message, final ByteBuf out) {
- boolean isPostgreSQLIdentifierPacket = message instanceof PostgreSQLIdentifierPacket;
- if (isPostgreSQLIdentifierPacket) {
+ public void encode(final ChannelHandlerContext context, final DatabasePacket message, final ByteBuf out) {
+ boolean isIdentifierPacket = message instanceof PostgreSQLIdentifierPacket;
+ if (isIdentifierPacket) {
prepareMessageHeader(out, ((PostgreSQLIdentifierPacket) message).getIdentifier().getValue());
}
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(out, context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get());
@@ -121,11 +121,11 @@ public final class OpenGaussPacketCodecEngine implements DatabasePacketCodecEngi
// TODO consider what severity to use
OpenGaussErrorResponsePacket errorResponsePacket = new OpenGaussErrorResponsePacket(
PostgreSQLMessageSeverityLevel.ERROR, PostgreSQLVendorError.SYSTEM_ERROR.getSqlState().getValue(), ex.getMessage());
- isPostgreSQLIdentifierPacket = true;
+ isIdentifierPacket = true;
prepareMessageHeader(out, errorResponsePacket.getIdentifier().getValue());
errorResponsePacket.write(payload);
} finally {
- if (isPostgreSQLIdentifierPacket) {
+ if (isIdentifierPacket) {
updateMessageLength(out);
}
}
diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java
index 626a5e12667..3b5262c1bab 100644
--- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java
+++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java
@@ -20,15 +20,15 @@ package org.apache.shardingsphere.db.protocol.postgresql.codec;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.CompositeByteBuf;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
-import org.apache.shardingsphere.dialect.postgresql.vendor.PostgreSQLVendorError;
+import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
+import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.db.protocol.postgresql.constant.PostgreSQLMessageSeverityLevel;
-import org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacketType;
import org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQLErrorResponsePacket;
import org.apache.shardingsphere.db.protocol.postgresql.packet.identifier.PostgreSQLIdentifierPacket;
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
+import org.apache.shardingsphere.dialect.postgresql.vendor.PostgreSQLVendorError;
import java.nio.charset.Charset;
import java.util.LinkedList;
@@ -37,7 +37,7 @@ import java.util.List;
/**
* Database packet codec for PostgreSQL.
*/
-public final class PostgreSQLPacketCodecEngine implements DatabasePacketCodecEngine<PostgreSQLPacket> {
+public final class PostgreSQLPacketCodecEngine implements DatabasePacketCodecEngine {
private static final int SSL_REQUEST_PAYLOAD_LENGTH = 8;
@@ -104,9 +104,9 @@ public final class PostgreSQLPacketCodecEngine implements DatabasePacketCodecEng
}
@Override
- public void encode(final ChannelHandlerContext context, final PostgreSQLPacket message, final ByteBuf out) {
- boolean isPostgreSQLIdentifierPacket = message instanceof PostgreSQLIdentifierPacket;
- if (isPostgreSQLIdentifierPacket) {
+ public void encode(final ChannelHandlerContext context, final DatabasePacket message, final ByteBuf out) {
+ boolean isIdentifierPacket = message instanceof PostgreSQLIdentifierPacket;
+ if (isIdentifierPacket) {
prepareMessageHeader(out, ((PostgreSQLIdentifierPacket) message).getIdentifier().getValue());
}
PostgreSQLPacketPayload payload = new PostgreSQLPacketPayload(out, context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get());
@@ -119,11 +119,11 @@ public final class PostgreSQLPacketCodecEngine implements DatabasePacketCodecEng
// TODO consider what severity to use
PostgreSQLErrorResponsePacket errorResponsePacket = PostgreSQLErrorResponsePacket.newBuilder(
PostgreSQLMessageSeverityLevel.ERROR, PostgreSQLVendorError.SYSTEM_ERROR, ex.getMessage()).build();
- isPostgreSQLIdentifierPacket = true;
+ isIdentifierPacket = true;
prepareMessageHeader(out, errorResponsePacket.getIdentifier().getValue());
errorResponsePacket.write(payload);
} finally {
- if (isPostgreSQLIdentifierPacket) {
+ if (isIdentifierPacket) {
updateMessageLength(out);
}
}
diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
index 4a8a5fd1701..1f7308cc5d4 100644
--- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
+++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
@@ -18,17 +18,16 @@
package org.apache.shardingsphere.proxy.frontend.fixture;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationEngine;
import org.apache.shardingsphere.proxy.frontend.command.CommandExecuteEngine;
import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine;
import org.apache.shardingsphere.test.fixture.infra.database.type.MockedDatabaseType;
-public final class DatabaseProtocolFrontendEngineFixture implements DatabaseProtocolFrontendEngine<DatabasePacket> {
+public final class DatabaseProtocolFrontendEngineFixture implements DatabaseProtocolFrontendEngine {
@Override
- public DatabasePacketCodecEngine<DatabasePacket> getCodecEngine() {
+ public DatabasePacketCodecEngine getCodecEngine() {
return null;
}
diff --git a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/executor/QueryCommandExecutor.java b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/executor/QueryCommandExecutor.java
index 846aff0a397..90bc82fd340 100644
--- a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/executor/QueryCommandExecutor.java
+++ b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/executor/QueryCommandExecutor.java
@@ -23,10 +23,8 @@ import java.sql.SQLException;
/**
* Query command executor.
- *
- * @param <T> type of database packet
*/
-public interface QueryCommandExecutor<T extends DatabasePacket> extends CommandExecutor {
+public interface QueryCommandExecutor extends CommandExecutor {
/**
* Get response type.
@@ -49,5 +47,5 @@ public interface QueryCommandExecutor<T extends DatabasePacket> extends CommandE
* @return database packet of query row
* @throws SQLException SQL exception
*/
- T getQueryRowPacket() throws SQLException;
+ DatabasePacket getQueryRowPacket() throws SQLException;
}
diff --git a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
index f6b4518c901..83b3a097736 100644
--- a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
+++ b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
@@ -19,18 +19,15 @@ package org.apache.shardingsphere.proxy.frontend.spi;
import io.netty.channel.Channel;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
+import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationEngine;
import org.apache.shardingsphere.proxy.frontend.command.CommandExecuteEngine;
-import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
/**
* Database protocol frontend engine.
- *
- * @param <T> type of database packet
*/
-public interface DatabaseProtocolFrontendEngine<T extends DatabasePacket> extends TypedSPI {
+public interface DatabaseProtocolFrontendEngine extends TypedSPI {
/**
* Initialize channel.
@@ -45,7 +42,7 @@ public interface DatabaseProtocolFrontendEngine<T extends DatabasePacket> extend
*
* @return database packet codec engine
*/
- DatabasePacketCodecEngine<T> getCodecEngine();
+ DatabasePacketCodecEngine getCodecEngine();
/**
* Get authentication engine.
diff --git a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
index d338aeb01aa..f0bf529a3ef 100644
--- a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
+++ b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
import org.apache.shardingsphere.db.protocol.mysql.codec.MySQLPacketCodecEngine;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLConstants;
import org.apache.shardingsphere.db.protocol.mysql.netty.MySQLSequenceIdInboundHandler;
-import org.apache.shardingsphere.db.protocol.mysql.packet.MySQLPacket;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationEngine;
import org.apache.shardingsphere.proxy.frontend.mysql.authentication.MySQLAuthenticationEngine;
@@ -38,13 +37,13 @@ import java.util.concurrent.atomic.AtomicInteger;
* Frontend engine for MySQL.
*/
@Getter
-public final class MySQLFrontendEngine implements DatabaseProtocolFrontendEngine<MySQLPacket> {
+public final class MySQLFrontendEngine implements DatabaseProtocolFrontendEngine {
private final AuthenticationEngine authenticationEngine = new MySQLAuthenticationEngine();
private final MySQLCommandExecuteEngine commandExecuteEngine = new MySQLCommandExecuteEngine();
- private final DatabasePacketCodecEngine<MySQLPacket> codecEngine = new MySQLPacketCodecEngine();
+ private final DatabasePacketCodecEngine codecEngine = new MySQLPacketCodecEngine();
@Override
public void initChannel(final Channel channel) {
diff --git a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index 5bd19e93e92..ff000ce2b57 100644
--- a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -57,7 +57,7 @@ import java.util.List;
* COM_STMT_EXECUTE command executor for MySQL.
*/
@RequiredArgsConstructor
-public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor<MySQLPacket> {
+public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
private final MySQLComStmtExecutePacket packet;
diff --git a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
index 4439d4169f5..68ba03a55d8 100644
--- a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
+++ b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/text/query/MySQLComQueryPacketExecutor.java
@@ -51,7 +51,7 @@ import java.util.Collection;
/**
* COM_QUERY command packet executor for MySQL.
*/
-public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor<MySQLPacket> {
+public final class MySQLComQueryPacketExecutor implements QueryCommandExecutor {
private final ConnectionSession connectionSession;
diff --git a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
index 2296eedd540..27fb277cfc6 100644
--- a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
+++ b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.proxy.frontend.opengauss;
import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.db.protocol.opengauss.codec.OpenGaussPacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.dialect.exception.transaction.InTransactionException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.frontend.opengauss.authentication.OpenGaussAuthenticationEngine;
@@ -32,7 +31,7 @@ import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngi
* Frontend engine for openGauss.
*/
@Getter
-public final class OpenGaussFrontendEngine implements DatabaseProtocolFrontendEngine<PostgreSQLPacket> {
+public final class OpenGaussFrontendEngine implements DatabaseProtocolFrontendEngine {
@Getter(AccessLevel.NONE)
private final PostgreSQLFrontendEngine postgreSQLFrontendEngine = new PostgreSQLFrontendEngine();
diff --git a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
index 2a9c0b77be0..8021ec31dee 100644
--- a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
+++ b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
@@ -57,7 +57,7 @@ import java.util.LinkedList;
/**
* Command query executor for openGauss.
*/
-public final class OpenGaussComQueryExecutor implements QueryCommandExecutor<PostgreSQLPacket> {
+public final class OpenGaussComQueryExecutor implements QueryCommandExecutor {
private final PortalContext portalContext;
diff --git a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
index 39e521bcaeb..6608148b610 100644
--- a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
+++ b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.proxy.frontend.postgresql;
import lombok.Getter;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
import org.apache.shardingsphere.db.protocol.postgresql.codec.PostgreSQLPacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.dialect.exception.transaction.InTransactionException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.frontend.authentication.AuthenticationEngine;
@@ -33,13 +32,13 @@ import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngi
* Frontend engine for PostgreSQL.
*/
@Getter
-public final class PostgreSQLFrontendEngine implements DatabaseProtocolFrontendEngine<PostgreSQLPacket> {
+public final class PostgreSQLFrontendEngine implements DatabaseProtocolFrontendEngine {
private final AuthenticationEngine authenticationEngine = new PostgreSQLAuthenticationEngine();
private final PostgreSQLCommandExecuteEngine commandExecuteEngine = new PostgreSQLCommandExecuteEngine();
- private final DatabasePacketCodecEngine<PostgreSQLPacket> codecEngine = new PostgreSQLPacketCodecEngine();
+ private final DatabasePacketCodecEngine codecEngine = new PostgreSQLPacketCodecEngine();
@Override
public void release(final ConnectionSession connectionSession) {
diff --git a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
index 403117c876a..77e5fef34b4 100644
--- a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
+++ b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
@@ -57,7 +57,7 @@ import java.util.LinkedList;
/**
* Command query executor for PostgreSQL.
*/
-public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor<PostgreSQLPacket> {
+public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
private final PortalContext portalContext;