Fix sonar issues of Convert this Set to an EnumSet (apache#25827)

pengge · May 21, 2023 · 93690f2 · 93690f2
1 parent 68b32f7
commit 93690f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/...che/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketType.java b/...che/shardingsphere/db/protocol/postgresql/packet/command/PostgreSQLCommandPacketType.java
@@ -23,8 +23,7 @@
 import org.apache.shardingsphere.db.protocol.postgresql.exception.PostgreSQLProtocolException;
 import org.apache.shardingsphere.db.protocol.postgresql.packet.identifier.PostgreSQLIdentifierTag;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
 /**
@@ -56,9 +55,9 @@ public enum PostgreSQLCommandPacketType implements CommandPacketType, PostgreSQL
 
     TERMINATE('X');
 
-    private static final Set<PostgreSQLCommandPacketType> EXTENDED_PROTOCOL_PACKET_TYPE = new HashSet<>(Arrays.asList(PostgreSQLCommandPacketType.PARSE_COMMAND,
-            PostgreSQLCommandPacketType.BIND_COMMAND, PostgreSQLCommandPacketType.DESCRIBE_COMMAND, PostgreSQLCommandPacketType.EXECUTE_COMMAND, PostgreSQLCommandPacketType.SYNC_COMMAND,
-            PostgreSQLCommandPacketType.CLOSE_COMMAND, PostgreSQLCommandPacketType.FLUSH_COMMAND));
+    private static final Set<PostgreSQLCommandPacketType> EXTENDED_PROTOCOL_PACKET_TYPES = EnumSet.of(PostgreSQLCommandPacketType.PARSE_COMMAND,
+            PostgreSQLCommandPacketType.BIND_COMMAND, PostgreSQLCommandPacketType.DESCRIBE_COMMAND, PostgreSQLCommandPacketType.EXECUTE_COMMAND,
+            PostgreSQLCommandPacketType.SYNC_COMMAND, PostgreSQLCommandPacketType.CLOSE_COMMAND, PostgreSQLCommandPacketType.FLUSH_COMMAND);
 
     private final char value;
 
@@ -85,6 +84,6 @@ public static PostgreSQLCommandPacketType valueOf(final int value) {
      * @return is extended protocol packet type
      */
     public static boolean isExtendedProtocolPacketType(final CommandPacketType commandPacketType) {
-        return EXTENDED_PROTOCOL_PACKET_TYPE.contains(commandPacketType);
+        return EXTENDED_PROTOCOL_PACKET_TYPES.contains(commandPacketType);
     }
 }
diff --git a/...nt/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/enums/DirectionType.java b/...nt/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/enums/DirectionType.java
@@ -20,10 +20,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.EnumSet;
 
 /**
  * Direction type enum.
@@ -60,12 +58,11 @@ public enum DirectionType {
 
     BACKWARD_ALL("BACKWARD ALL");
 
-    private static final Set<DirectionType> ALL_DIRECTION_TYPES = new HashSet<>(Arrays.asList(ALL, FORWARD_ALL, BACKWARD_ALL));
+    private static final Collection<DirectionType> ALL_DIRECTION_TYPES = EnumSet.of(ALL, FORWARD_ALL, BACKWARD_ALL);
 
-    private static final Collection<DirectionType> FORWARD_COUNT_DIRECTION_TYPES =
-            new HashSet<>(Arrays.asList(DirectionType.NEXT, DirectionType.COUNT, DirectionType.FORWARD, DirectionType.FORWARD_COUNT));
+    private static final Collection<DirectionType> FORWARD_COUNT_DIRECTION_TYPES = EnumSet.of(DirectionType.NEXT, DirectionType.COUNT, DirectionType.FORWARD, DirectionType.FORWARD_COUNT);
 
-    private static final Collection<DirectionType> BACKWARD_COUNT_DIRECTION_TYPES = new HashSet<>(Arrays.asList(DirectionType.PRIOR, DirectionType.BACKWARD, DirectionType.BACKWARD_COUNT));
+    private static final Collection<DirectionType> BACKWARD_COUNT_DIRECTION_TYPES = EnumSet.of(DirectionType.PRIOR, DirectionType.BACKWARD, DirectionType.BACKWARD_COUNT);
 
     private final String name;