Merge pull request #17 from yumaoka/bug-15-rb-avail-langs

RB lookup can no longer rely on the fixed supported languages list
IBM-Cloud · Sep 30, 2016 · 2f3b4ee · 2f3b4ee
2 parents 9eb4b69 + 686179f
commit 2f3b4ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 51 deletions.
diff --git a/src/main/java/com/ibm/g11n/pipeline/client/rb/CloudResourceBundle.java b/src/main/java/com/ibm/g11n/pipeline/client/rb/CloudResourceBundle.java
@@ -54,7 +54,7 @@ static CloudResourceBundle loadBundle(ServiceAccount serviceAccount, String bund
             Map<String, String> resStrings = client.getResourceStrings(bundleId, locale.toLanguageTag(), false);
             crb = new CloudResourceBundle(resStrings);
         } catch (ServiceException e) {
-            logger.warning("An error occurred while loading resource data for " + locale
+            logger.info("Could not fetch resource data for " + locale
                     + " from the translation bundle " + bundleId + ": " + e.getMessage());
         }
         return crb;

diff --git a/src/main/java/com/ibm/g11n/pipeline/client/rb/CloudResourceBundleControl.java b/src/main/java/com/ibm/g11n/pipeline/client/rb/CloudResourceBundleControl.java
@@ -18,22 +18,15 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import com.ibm.g11n.pipeline.client.ServiceAccount;
-import com.ibm.g11n.pipeline.client.ServiceClient;
-import com.ibm.g11n.pipeline.client.ServiceException;
-import com.ibm.g11n.pipeline.client.ServiceInfo;
 
 /**
  * <code>CloudResourceBundleControl</code> is a concrete subclass of {@link Control}.
@@ -93,9 +86,6 @@ List<String> getFormatList() {
         }
     };
 
-    private static final ConcurrentHashMap<String, Set<Locale>> SUPPORTED_LOCALES =
-            new ConcurrentHashMap<String, Set<Locale>>();
-
     /**
      * Default resource bundle cache expiration time (60000 = 10 minutes)
      */
@@ -421,59 +411,32 @@ public boolean needsReload(String baseName, Locale locale, String format, ClassL
     public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
         throws IllegalAccessException, InstantiationException, IOException {
 
-        if (!format.equals(FORMAT_GP_CLOUD_BUNDLE)
-                || isExcluded(baseName)) {
+        if (!format.equals(FORMAT_GP_CLOUD_BUNDLE)) {
+            // When requested resource format is not GP cloud bundle,
+            // just delegate the request to the Java's default implementation.
             return super.newBundle(baseName, locale, format, loader, reload);
         }
 
-        if (!isLocaleSupportedByService(locale)) {
+        if (isExcluded(baseName)) {
+            return null;
+        }
+
+        if (locale.getLanguage().isEmpty()) {
+            // Globalization Pipeline does not support a locale
+            // with no language code, including root locale
             return null;
         }
 
+        // Map the input baseName to GP's bundleId if NameMapper is available
         String bundleId = nameMapper != null ? nameMapper.getBundleID(baseName) : baseName;
         if (bundleId == null) {
             return null;
         }
+
         // loadBundle returns null if locale is not available
         return CloudResourceBundle.loadBundle(serviceAccount, bundleId, locale);
     }
 
-    /**
-     * Returns if the specified locale is supported by the service.
-     * This implementation calls $service/v2/info endpoint and cache the
-     * results. This method returns true if the specified locale is included
-     * in the supported language list (both source/target). It does not
-     * mean the specified language is available in a specific translation bundle.
-     * 
-     * @param locale The locale.
-     * @return true if the specified locale is supported by the service.
-     */
-    private boolean isLocaleSupportedByService(Locale locale) {
-        String url = serviceAccount.getUrl();
-        Set<Locale> locales = SUPPORTED_LOCALES.get(url);
-        if (locales == null) {
-            ServiceClient client = ServiceClient.getInstance(serviceAccount);
-            try {
-                ServiceInfo svcInfo = client.getServiceInfo();
-                locales = new HashSet<Locale>();
-                Map<String, Set<String>> supported = svcInfo.getSupportedTranslation();
-                if (supported != null) {
-                    for (Entry<String, Set<String>> targetsBySource : supported.entrySet()) {
-                        String src = targetsBySource.getKey();
-                        locales.add(Locale.forLanguageTag(src));
-                        for (String target : targetsBySource.getValue()) {
-                            locales.add(Locale.forLanguageTag(target));
-                        }
-                    }
-                }
-                SUPPORTED_LOCALES.putIfAbsent(url, locales);
-            } catch (ServiceException e) {
-                return false;
-            }
-        }
-        return locales.contains(locale);
-    }
-
     private boolean isExcluded(String baseName) {
         if (DEFAULT_EXCLUSION.matcher(baseName).matches()) {
             return true;

diff --git a/src/main/java/com/ibm/g11n/pipeline/client/rb/package-info.java b/src/main/java/com/ibm/g11n/pipeline/client/rb/package-info.java
@@ -82,6 +82,6 @@
  * classpath can be done by
  * <a href="https://www.ng.bluemix.net/docs/starters/liberty/index.html#customizingjre">Customizing
  * the JRE</a>. The SDK jar file should be placed in resources/.java-overlay/.java/.jre/lib/ext
- * folder in your application pacakge.
+ * folder in your application package.
  */
 package com.ibm.g11n.pipeline.client.rb;