Removed unused unqualified names from WebSocketConstants

src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/websocket/WebSocketConstants.java

@@ -1,4 +1,4 @@
-/** Copyright (c) 2022, 2023 IBM Corporation and others.
+/** Copyright (c) 2022, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class WebSocketConstants {
     public static final String DIAGNOSTIC_SOURCE = "jakarta-websocket";
@@ -58,12 +57,19 @@ public class WebSocketConstants {
     public static final String CLIENT_ENDPOINT_ANNOTATION = "jakarta.websocket.ClientEndpoint";
 
     // Superclass
-    public static final String ENDPOINT_SUPERCLASS = "Endpoint";
     public static final String FQ_ENDPOINT_SUPERCLASS = "jakarta.websocket.Endpoint";
     public static final String IS_SUPERCLASS = "isSuperclass";
 
     public static final String[] WS_ANNOTATION_CLASS = { SERVER_ENDPOINT_ANNOTATION, CLIENT_ENDPOINT_ANNOTATION };
 
+    public static final String BOOLEAN = "java.lang.Boolean";
+    public static final String INTEGER = "java.lang.Integer";
+    public static final String LONG = "java.lang.Long";
+    public static final String DOUBLE = "java.lang.Double";
+    public static final String FLOAT = "java.lang.Float";
+    public static final String CHARACTER = "java.lang.Character";
+    public static final String BYTE = "java.lang.Byte";
+    public static final String SHORT = "java.lang.Short";
     public static final String STRING_CLASS_LONG = "java.lang.String";
     public static final String STRING_CLASS_SHORT = "String";
     public static final String READER_CLASS_LONG = "java.io.Reader";
@@ -76,8 +82,6 @@ public class WebSocketConstants {
     public static final String PONGMESSAGE_CLASS_SHORT = "PongMessage";
     public static final Set<String> LONG_MESSAGE_CLASSES = new HashSet<>(
             Arrays.asList(STRING_CLASS_LONG, READER_CLASS_LONG, BYTEBUFFER_CLASS_LONG, INPUTSTREAM_CLASS_LONG, PONGMESSAGE_CLASS_LONG));
-    public static final Set<String> SHORT_MESSAGE_CLASSES = new HashSet<>(
-            Arrays.asList(STRING_CLASS_SHORT, READER_CLASS_SHORT, BYTEBUFFER_CLASS_SHORT, INPUTSTREAM_CLASS_SHORT, PONGMESSAGE_CLASS_SHORT));
     public static final String SESSION_CLASS = "jakarta.websocket.Session";
 
     /* Annotations */
@@ -102,9 +106,7 @@ public class WebSocketConstants {
             Arrays.asList("CloseReason", "Session"));
 
     public static final Set<String> RAW_WRAPPER_OBJS = new HashSet<>(
-            Arrays.asList("String", "Boolean", "Integer", "Long", "Double", "Float"));
-    public static final Set<String> WRAPPER_OBJS = RAW_WRAPPER_OBJS.stream().map(raw -> "java.lang.".concat(raw))
-            .collect(Collectors.toSet());
+            Arrays.asList(BOOLEAN, INTEGER, LONG, DOUBLE, FLOAT, CHARACTER, BYTE, SHORT, STRING_CLASS_LONG));
 
     // Enums
     public enum MESSAGE_FORMAT {

src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/websocket/WebSocketDiagnosticsCollector.java

@@ -325,8 +325,7 @@ private List<String> findAndProcessEndpointURI(PsiClass type) {
      * @return if valueClass is a wrapper object
      */
     private boolean isWrapper(String valueClass) {
-        return WebSocketConstants.WRAPPER_OBJS.contains(valueClass)
-                || WebSocketConstants.RAW_WRAPPER_OBJS.contains(valueClass);
+        return WebSocketConstants.RAW_WRAPPER_OBJS.contains(valueClass);
     }
 
     /**