Fixed a merge issue

Author: Yoshito Umaoka

gp-ant-task/example/gp-ant-task.jar

@@ -64,7 +64,7 @@ public void setOutputDir(File outputDir) {
      * Whether this goal overwrites existing bundle file in output directory
      * or not. The default value is true.
      */
-    private boolean overwrite;
+    private boolean overwrite = true;
 
     public void setOverwrite(boolean overwrite) {
         this.overwrite = overwrite;
@@ -236,15 +236,37 @@ private void exportLanguageResource(ServiceClient client, SourceBundleFile bf, S
             outputFile.getParentFile().mkdirs();
         }
 
+        Bundle bundle;
+
         switch (outContntOpt) {
         case MERGE_TO_SOURCE:
-            mergeTranslation(client, bf.getBundleId(), language, bf.getType(), bf.getFile(), outputFile);
+            bundle = getBundle(client, bf.getBundleId(), language, false, true);
+            mergeTranslation(bundle, language, bf.getType(), bf.getFile(), outputFile);
             break;
+
         case TRANSLATED_WITH_FALLBACK:
-            exportTranslation(client, bf.getBundleId(), language, bf.getType(), outputFile, true);
+            bundle = getBundle(client, bf.getBundleId(), language, false, true);
+            exportTranslation(bundle, language, bf.getType(), outputFile);
             break;
+
         case TRANSLATED_ONLY:
-            exportTranslation(client, bf.getBundleId(), language, bf.getType(), outputFile, false);
+            bundle = getBundle(client, bf.getBundleId(), language, false, false);
+            exportTranslation(bundle, language, bf.getType(), outputFile);
+            break;
+
+        case MERGE_REVIEWED_TO_SOURCE:
+            bundle = getBundle(client, bf.getBundleId(), language, true, true);
+            mergeTranslation(bundle, language, bf.getType(), bf.getFile(), outputFile);
+            break;
+
+        case REVIEWED_WITH_FALLBACK:
+            bundle = getBundle(client, bf.getBundleId(), language, true, true);
+            exportTranslation(bundle, language, bf.getType(), outputFile);
+            break;
+
+        case REVIEWED_ONLY:
+            bundle = getBundle(client, bf.getBundleId(), language, true, false);
+            exportTranslation(bundle, language, bf.getType(), outputFile);
             break;
         }
     }
@@ -269,63 +291,61 @@ private String getLanguageId(String gpLanguageTag, LanguageIdStyle langIdStyle,
         return languageId;
     }
 
-    private void mergeTranslation(ServiceClient client, String bundleId, String language,
-            ResourceType type, File srcFile, File outFile) throws BuildException {
-        Bundle resBundle = null;
-        try {
-            resBundle = getBundle(client, bundleId, language, false);
-        } catch (ServiceException e) {
-            throw new BuildException("Globalization Pipeline service error", e);
-        }
-
+    private void mergeTranslation(Bundle bundle, String language, ResourceType type,
+            File srcFile, File outFile) throws BuildException {
         ResourceFilter filter = ResourceFilterFactory.get(type);
         try (FileOutputStream fos = new FileOutputStream(outFile);
                 FileInputStream fis = new FileInputStream(srcFile)) {
-            filter.merge(fis, fos, language, resBundle);
+            filter.merge(fis, fos, language, bundle);
         } catch (IOException e) {
             throw new BuildException("I/O error while merging the translated values to "
                     + outFile.getAbsolutePath(), e);
         }
     }
 
-    private void exportTranslation(ServiceClient client, String bundleId, String language,
-            ResourceType type, File outFile, boolean withFallback) throws BuildException {
-        Bundle resBundle = null;
-        try {
-            resBundle = getBundle(client, bundleId, language, withFallback);
-        } catch (ServiceException e) {
-            throw new BuildException("Globalization Pipeline service error", e);
-        }
-
+    private void exportTranslation(Bundle bundle, String language, ResourceType type,
+            File outFile) throws BuildException {
         ResourceFilter filter = ResourceFilterFactory.get(type);
         try (FileOutputStream fos = new FileOutputStream(outFile)) {
-            filter.write(fos, language, resBundle);
+            filter.write(fos, language, bundle);
         } catch (IOException e) {
             throw new BuildException("Failed to write the translated resoruce data to "
                     + outFile.getAbsolutePath(), e);
         }
     }
 
-    private Bundle getBundle(ServiceClient client,
-            String bundleId, String language, boolean withFallback) throws ServiceException {
-        Map<String, ResourceEntryData> resEntries = client.getResourceEntries(bundleId, language);
-        Collection<ResourceString> resStrings = new LinkedList<>();
-        for (Entry<String, ResourceEntryData> entry : resEntries.entrySet()) {
-            String key = entry.getKey();
-            ResourceEntryData data = entry.getValue();
-            String resVal = data.getValue();
-            Integer seqNum = data.getSequenceNumber();
-            if (resVal == null && withFallback) {
-                resVal = data.getSourceValue();
-            }
-            if (resVal != null) {
-                ResourceString resString = new ResourceString(key, resVal);
-                if (seqNum != null) {
-                    resString.setSequenceNumber(seqNum.intValue());
+    private Bundle getBundle(ServiceClient client, String bundleId, String language,
+            boolean reviewedOnly, boolean withFallback) throws BuildException {
+        try {
+            Map<String, ResourceEntryData> resEntries = client.getResourceEntries(bundleId, language);
+            Collection<ResourceString> resStrings = new LinkedList<>();
+            for (Entry<String, ResourceEntryData> entry : resEntries.entrySet()) {
+                String key = entry.getKey();
+                ResourceEntryData data = entry.getValue();
+                String resVal = data.getValue();
+                Integer seqNum = data.getSequenceNumber();
+
+                if (reviewedOnly) {
+                    if (!data.isReviewed()) {
+                        resVal = null;
+                    }
+                }
+
+                if (resVal == null && withFallback) {
+                    resVal = data.getSourceValue();
+                }
+
+                if (resVal != null) {
+                    ResourceString resString = new ResourceString(key, resVal);
+                    if (seqNum != null) {
+                        resString.setSequenceNumber(seqNum.intValue());
+                    }
+                    resStrings.add(resString);
                 }
-                resStrings.add(resString);
             }
+            return new Bundle(resStrings, null);
+        } catch (ServiceException e) {
+            throw new BuildException("Globalization Pipeline service error", e);
         }
-        return new Bundle(resStrings, null);
     }
 }

gp-ant-task/src/main/java/com/ibm/g11n/pipeline/ant/GPDownloadTask.java

@@ -21,15 +21,41 @@
  * @author Yoshito Umaoka
  */
 public enum OutputContentOption {
-    // Merges translated resources into source file contents
-    // if possible. If the output resource format does not support
-    // this option, TRANSLATION_WITH_FALLBACK is used.
+    /**
+     * Merges translated resources into source file contents
+     * if possible. If the output resource format does not support
+     * this option, {@link #TRANSLATED_WITH_FALLBACK} is used.
+     */
     MERGE_TO_SOURCE,
 
-    // Exports translated resources. If translation is not available
-    // for a resource key, the value from the source bundle is used.
+    /**
+     * Exports translated resources. If translation is not available
+     * for a resource key, the value from the source bundle is used.
+     */
     TRANSLATED_WITH_FALLBACK,
 
-    // Exports only translated resources.
-    TRANSLATED_ONLY
+    /**
+     * Exports only translated resources.
+     */
+    TRANSLATED_ONLY,
+
+    /**
+     * Merges translated resources marked as reviewed into source
+     * file contents if possible. If the output resource format
+     * does not support this option, {@link #REVIEWED_WITH_FALLBACK}
+     * is used.
+     */
+    MERGE_REVIEWED_TO_SOURCE,
+
+    /**
+     * Exports translated resources marked as reviewed. If translation
+     * is not available or, not marked as reviewed, the value from the
+     * source bundle is used.
+     */
+    REVIEWED_WITH_FALLBACK,
+
+    /**
+     * Exports only translated resources marked as reviewed.
+     */
+    REVIEWED_ONLY
 }