Merge pull request #41667 from geoand/HeaderUtil-polish

Polish HeaderUtil
quarkusio · Jul 4, 2024 · 541f56d · 541f56d
2 parents bcc66be + 21ce94b
commit 541f56d
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...e/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java b/...e/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java
@@ -114,8 +114,7 @@ public static URI getLocation(MultivaluedMap<String, ? extends Object> headers)
 
     public static MediaType getMediaType(MultivaluedMap<String, ? extends Object> headers) {
         Object first = headers.getFirst(HttpHeaders.CONTENT_TYPE);
-        if (first instanceof String) {
-            String contentType = (String) first;
+        if (first instanceof String contentType) {
             return MediaType.valueOf(contentType);
         } else {
             return (MediaType) first;
@@ -150,8 +149,7 @@ public static Map<String, Cookie> getCookies(MultivaluedMap<String, ? extends Ob
             return Collections.emptyMap();
         Map<String, Cookie> cookies = new HashMap<String, Cookie>();
         for (Object obj : list) {
-            if (obj instanceof Cookie) {
-                Cookie cookie = (Cookie) obj;
+            if (obj instanceof Cookie cookie) {
                 cookies.put(cookie.getName(), cookie);
             } else {
                 String str = headerToString(obj);
@@ -170,8 +168,7 @@ public static Map<String, NewCookie> getNewCookies(MultivaluedMap<String, ? exte
         }
         Map<String, NewCookie> cookies = new HashMap<>();
         for (Object obj : list) {
-            if (obj instanceof NewCookie) {
-                NewCookie cookie = (NewCookie) obj;
+            if (obj instanceof NewCookie cookie) {
                 cookies.put(cookie.getName(), cookie);
             } else {
                 String str = HeaderUtil.headerToString(obj);
@@ -203,7 +200,7 @@ public static String getHeaderString(MultivaluedMap<String, ? extends Object> he
         }
         StringBuilder sb = new StringBuilder();
         for (Object s : list) {
-            if (sb.length() > 0) {
+            if (!sb.isEmpty()) {
                 sb.append(",");
             }
             sb.append(headerToString(s));
@@ -267,13 +264,13 @@ public static List<MediaType> getAcceptableMediaTypes(MultivaluedMap<String, ? e
         if (accepts == null || accepts.isEmpty()) {
             return Collections.singletonList(MediaType.WILDCARD_TYPE);
         }
-        List<MediaType> list = new ArrayList<MediaType>();
+        List<MediaType> list = new ArrayList<>();
         for (Object obj : accepts) {
             if (obj instanceof MediaType) {
                 list.add((MediaType) obj);
                 continue;
             }
-            String accept = null;
+            String accept;
             if (obj instanceof String) {
                 accept = (String) obj;
             } else {
@@ -315,7 +312,7 @@ public static List<Locale> getAcceptableLanguages(MultivaluedMap<String, ? exten
             }
         }
         Collections.sort(languages);
-        List<Locale> list = new ArrayList<Locale>(languages.size());
+        List<Locale> list = new ArrayList<>(languages.size());
         for (WeightedLanguage language : languages)
             list.add(language.getLocale());
         return list;