Clean up code.

Change-Id: I004da0cea235401fe7324d3384969c2a1c88a8eb
ChengJie1053 · Mar 28, 2024 · f2727b0 · f2727b0
1 parent 28c0123
commit f2727b0
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 128 deletions.
diff --git a/src/main/core-api/java/com/mysql/cj/ServerVersion.java b/src/main/core-api/java/com/mysql/cj/ServerVersion.java
@@ -76,7 +76,7 @@ public boolean equals(Object obj) {
             return false;
         }
         ServerVersion another = (ServerVersion) obj;
-        if (this.getMajor() != another.getMajor() || this.getMinor() != another.getMinor() || this.getSubminor() != another.getSubminor()) {
+        if (getMajor() != another.getMajor() || getMinor() != another.getMinor() || getSubminor() != another.getSubminor()) {
             return false;
         }
         return true;

diff --git a/src/main/core-api/java/com/mysql/cj/exceptions/DataTruncationException.java b/src/main/core-api/java/com/mysql/cj/exceptions/DataTruncationException.java
@@ -52,11 +52,11 @@ protected DataTruncationException(String message, Throwable cause, boolean enabl
 
     public DataTruncationException(String message, int index, boolean parameter, boolean read, int dataSize, int transferSize, int vendorErrorCode) {
         super(message);
-        this.setIndex(index);
-        this.setParameter(parameter);
-        this.setRead(read);
-        this.setDataSize(dataSize);
-        this.setTransferSize(transferSize);
+        setIndex(index);
+        setParameter(parameter);
+        setRead(read);
+        setDataSize(dataSize);
+        setTransferSize(transferSize);
         setVendorCode(vendorErrorCode);
     }
 

diff --git a/src/main/core-api/java/com/mysql/cj/result/Field.java b/src/main/core-api/java/com/mysql/cj/result/Field.java
@@ -289,15 +289,15 @@ public String toString() {
             asString.append(super.toString());
             asString.append("[");
             asString.append("dbName=");
-            asString.append(this.getDatabaseName());
+            asString.append(getDatabaseName());
             asString.append(",tableName=");
-            asString.append(this.getTableName());
+            asString.append(getTableName());
             asString.append(",originalTableName=");
-            asString.append(this.getOriginalTableName());
+            asString.append(getOriginalTableName());
             asString.append(",columnName=");
-            asString.append(this.getName());
+            asString.append(getName());
             asString.append(",originalColumnName=");
-            asString.append(this.getOriginalName());
+            asString.append(getOriginalName());
             asString.append(",mysqlType=");
             asString.append(getMysqlTypeId());
             asString.append("(");

diff --git a/src/main/core-impl/java/com/mysql/cj/NativeQueryBindings.java b/src/main/core-impl/java/com/mysql/cj/NativeQueryBindings.java
@@ -100,7 +100,7 @@ public QueryBindings clone() {
         newBindings.setBindValues(bvs);
         newBindings.isLoadDataQuery = this.isLoadDataQuery;
         newBindings.sendTypesToServer.set(this.sendTypesToServer.get());
-        newBindings.setLongParameterSwitchDetected(this.isLongParameterSwitchDetected());
+        newBindings.setLongParameterSwitchDetected(isLongParameterSwitchDetected());
         return newBindings;
     }
 

diff --git a/src/main/core-impl/java/com/mysql/cj/NativeSession.java b/src/main/core-impl/java/com/mysql/cj/NativeSession.java
@@ -132,7 +132,7 @@ public void connect(HostInfo hi, String user, String password, String database,
         this.hostInfo = hi;
 
         // reset max-rows to default value
-        this.setSessionMaxRows(-1);
+        setSessionMaxRows(-1);
 
         // TODO do we need different types of physical connections?
         SocketConnection socketConnection = new NativeSocketConnection();
@@ -153,7 +153,7 @@ public void connect(HostInfo hi, String user, String password, String database,
 
         this.isClosed = false;
 
-        this.commandBuilder = new NativeMessageBuilder(this.getServerSession().supportsQueryAttributes());
+        this.commandBuilder = new NativeMessageBuilder(getServerSession().supportsQueryAttributes());
     }
 
     // TODO: this method should not be used in user-level APIs

diff --git a/src/main/core-impl/java/com/mysql/cj/ServerPreparedQueryTestcaseGenerator.java b/src/main/core-impl/java/com/mysql/cj/ServerPreparedQueryTestcaseGenerator.java
@@ -59,14 +59,14 @@ public void serverPrepare(String sql) throws IOException {
     }
 
     private void dumpPrepareForTestcase() {
-        StringBuilder buf = new StringBuilder(this.getOriginalSql().length() + 64);
+        StringBuilder buf = new StringBuilder(getOriginalSql().length() + 64);
 
         this.session.getProtocol().generateQueryCommentBlock(buf);
 
         buf.append("PREPARE debug_stmt_");
         buf.append(this.statementId);
         buf.append(" FROM \"");
-        buf.append(this.getOriginalSql());
+        buf.append(getOriginalSql());
         buf.append("\";\n");
 
         TestUtils.dumpTestcaseQuery(buf.toString());
@@ -82,7 +82,7 @@ public <T extends Resultset> T serverExecute(int maxRowsToRetrieve, boolean crea
     private void dumpExecuteForTestcase() {
         StringBuilder buf = new StringBuilder();
 
-        for (int i = 0; i < this.getParameterCount(); i++) {
+        for (int i = 0; i < getParameterCount(); i++) {
             this.session.getProtocol().generateQueryCommentBlock(buf);
 
             buf.append("SET @debug_stmt_param");
@@ -102,9 +102,9 @@ private void dumpExecuteForTestcase() {
         buf.append("EXECUTE debug_stmt_");
         buf.append(this.statementId);
 
-        if (this.getParameterCount() > 0) {
+        if (getParameterCount() > 0) {
             buf.append(" USING ");
-            for (int i = 0; i < this.getParameterCount(); i++) {
+            for (int i = 0; i < getParameterCount(); i++) {
                 if (i > 0) {
                     buf.append(", ");
                 }

diff --git a/src/main/core-impl/java/com/mysql/cj/log/ProfilerEventImpl.java b/src/main/core-impl/java/com/mysql/cj/log/ProfilerEventImpl.java
@@ -150,7 +150,7 @@ public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("[");
 
-        switch (this.getEventType()) {
+        switch (getEventType()) {
             case TYPE_EXECUTE:
                 buf.append("EXECUTE");
                 break;

diff --git a/src/main/core-impl/java/com/mysql/cj/protocol/AbstractSocketConnection.java b/src/main/core-impl/java/com/mysql/cj/protocol/AbstractSocketConnection.java
@@ -83,7 +83,7 @@ public BufferedOutputStream getMysqlOutput() throws IOException {
 
     @Override
     public boolean isSSLEstablished() {
-        return ExportControlled.enabled() && ExportControlled.isSSLEstablished(this.getMysqlSocket());
+        return ExportControlled.enabled() && ExportControlled.isSSLEstablished(getMysqlSocket());
     }
 
     @Override