refactor: simplify getFlagCode method

FlowingCode · Aug 22, 2024 · 9089c58 · 9089c58
1 parent 9b317d3
commit 9089c58
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/java/com/flowingcode/vaadin/addons/localecombobox/LocaleComboBox.java b/src/main/java/com/flowingcode/vaadin/addons/localecombobox/LocaleComboBox.java
@@ -157,12 +157,8 @@ private Locale getLocaleForDisplay() {
 
   private String getFlagCode(Locale locale) {
     String countryCode = locale.getCountry();
-    Optional<String> isoCode = LocaleCountryConverter.convertToISO3166Code(countryCode);
-
-    if (isoCode.isPresent())
-      return isoCode.get().toLowerCase();
-
-    return DEFAULT_FLAG_CODE;
+    return LocaleCountryConverter.convertToISO3166Code(countryCode).map(String::toLowerCase)
+        .orElse(DEFAULT_FLAG_CODE);
   }
 
   private void onValueChange(ComponentValueChangeEvent<ComboBox<Locale>, Locale> event) {