Merge pull request #10624 from tkvw/3.2.x-i18n

Added method to retrieve the codes of a specific bundle.

Author: graemerocher

grails-core/src/main/groovy/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.java

@@ -23,10 +23,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -153,6 +150,41 @@ public void setBasename(String basename) {
 		setBasenames(basename);
 	}
 
+	/**
+	 * Retrieves all codes from one or multiple basenames
+	 * @param locale the locale
+	 * @param basenames the basenames of the bundle
+	 * @return a list with all codes from valid registered bundles
+	 */
+	public Set<String> getBundleCodes(Locale locale,String...basenames){
+		List<String> validBaseNames = getValidBasenames(basenames);
+		
+		Set<String> codes = new HashSet<>();
+		for(String basename: validBaseNames){
+			List<Pair<String, Resource>> filenamesAndResources = calculateAllFilenames(basename,locale);
+			for (Pair<String, Resource> filenameAndResource : filenamesAndResources) {
+				if(filenameAndResource.getbValue() != null) {
+					PropertiesHolder propHolder = getProperties(filenameAndResource.getaValue(), filenameAndResource.getbValue());
+					codes.addAll(propHolder.getProperties().stringPropertyNames());					
+				}
+			}
+		}
+		return codes;
+	}
+	
+	protected List<String> getValidBasenames(String[] basenames){
+		List<String> validBaseNames = new LinkedList<>();
+		for(String basename:basenames){
+			for(int i=0;i<this.basenames.length;i++){
+				if(basenames[i].equals(basename)){
+					validBaseNames.add(basename);
+					break;
+				}
+			}
+		}
+		return validBaseNames;
+	}
+	
 	/**
 	 * Set an array of basenames, each following the basic ResourceBundle convention
 	 * of not specifying file extension or language codes, but in contrast to

grails-core/src/test/groovy/org/grails/spring/context/ResourceBundleMessageSourceSpec.groovy

@@ -0,0 +1,49 @@
+package org.grails.spring.context
+
+import org.grails.spring.context.support.ReloadableResourceBundleMessageSource
+import org.springframework.core.io.ByteArrayResource
+import org.springframework.core.io.DefaultResourceLoader
+import org.springframework.core.io.Resource
+import spock.lang.Specification
+
+class ResourceBundleMessageSourceSpec extends Specification {
+    Resource messages
+    Resource other 
+    void setup(){
+        messages = new TestResource('messages.properties','''\
+            foo=bar
+        '''.stripIndent().getBytes('UTF-8'))
+         
+        other = new TestResource('other.properties','''\
+            bar=foo
+        '''.stripIndent().getBytes('UTF-8'))
+    }
+    
+    void 'Check method to retrieve bundle codes per messagebundle'(){
+        given:
+            def messageSource = new ReloadableResourceBundleMessageSource(
+                resourceLoader: new DefaultResourceLoader(){
+                    Resource getResourceByPath(String path){
+                        path.startsWith('messages') ? messages:other
+                    }
+                }
+            )
+            messageSource.setBasenames('messages','other')
+            def locale = Locale.default
+        expect:
+            messageSource.getBundleCodes(locale,'messages') == (['foo'] as Set)
+            messageSource.getBundleCodes(locale,'other') == (['bar'] as Set)
+            messageSource.getBundleCodes(locale,'messages','other') == (['foo','bar'] as Set)
+    }
+    
+    class TestResource extends ByteArrayResource{
+        String filename
+
+        TestResource(String filename, byte[] byteArray) {
+            super(byteArray)
+            this.filename=filename
+        }
+        
+    }
+    
+}