add merge type option to Maven client (Fixes issue 28)

zanata · Apr 13, 2011 · ca63a8b · ca63a8b
1 parent 94c6b01
commit ca63a8b
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 3 deletions.
diff --git a/client/flies-client-ant-po/src/main/java/net/openl10n/flies/client/ant/po/UploadPoTask.java b/client/flies-client-ant-po/src/main/java/net/openl10n/flies/client/ant/po/UploadPoTask.java
@@ -20,6 +20,7 @@ public class UploadPoTask extends ConfigurableProjectTask implements PublicanPus
    private boolean importPo;
    private boolean copyTrans = true;
    private boolean validate;
+   private String mergeType = "auto";
 
    public static void main(String[] args)
    {
@@ -111,6 +112,12 @@ public String getSourceLang()
    {
       return sourceLang;
    }
+
+   @Override
+   public String getMergeType()
+   {
+      return mergeType;
+   }
 
 
 }
diff --git a/...client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushCommand.java b/...client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushCommand.java
@@ -72,6 +72,7 @@ public void run() throws Exception
       log.info("Username: {}", opts.getUsername());
       log.info("Source language: {}", opts.getSourceLang());
       log.info("Copy previous translations: {}", opts.getCopyTrans());
+      log.info("Merge type: {}", opts.getMergeType());
       if (opts.getImportPo())
       {
          log.info("Importing source and target documents");
@@ -226,7 +227,7 @@ else if (opts.isInteractiveMode())
                      JaxbUtil.validateXml(targetDoc, jc);
                   }
                   log.info("pushing target document [name={} client-locale={}] to server [locale={}]", new Object[] { srcDoc.getName(), locale.getLocalLocale(), locale.getLocale() });
-                  ClientResponse<String> putTransResponse = translationResources.putTranslations(docUri, new LocaleId(locale.getLocale()), targetDoc, extensions);
+                  ClientResponse<String> putTransResponse = translationResources.putTranslations(docUri, new LocaleId(locale.getLocale()), targetDoc, extensions, opts.getMergeType());
                   ClientUtility.checkResult(putTransResponse, uri);
                }
             }

diff --git a/...client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptions.java b/...client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptions.java
@@ -10,4 +10,5 @@ public interface PublicanPushOptions extends ConfigurableProjectOptions
    public boolean getImportPo();
    public boolean getCopyTrans();
    public boolean getValidate();
+   public String getMergeType();
 }
diff --git a/...nt-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptionsImpl.java b/...nt-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptionsImpl.java
@@ -19,6 +19,7 @@ public class PublicanPushOptionsImpl extends ConfigurableProjectOptionsImpl impl
    private boolean importPo;
    private boolean copyTrans = true;
    private boolean validate;
+   private String mergeType = "auto";
 
    public PublicanPushOptionsImpl()
    {
@@ -117,5 +118,11 @@ public String getSourceLang()
    {
       return sourceLang;
    }
+
+   @Override
+   public String getMergeType()
+   {
+      return mergeType;
+   }
 
 }
diff --git a/...nt-commands/src/test/java/net/openl10n/flies/client/commands/PublicanPushCommandTest.java b/...nt-commands/src/test/java/net/openl10n/flies/client/commands/PublicanPushCommandTest.java
@@ -94,7 +94,7 @@ private void publicanPush(boolean importPo, boolean mapLocale) throws Exception
             expectedLocale = new LocaleId("ja");
          else
             expectedLocale = new LocaleId("ja-JP");
-         EasyMock.expect(mockTranslationResources.putTranslations(eq("RPM"), eq(expectedLocale), (TranslationsResource) notNull(), eq(extensionSet))).andReturn(mockOKResponse);
+         EasyMock.expect(mockTranslationResources.putTranslations(eq("RPM"), eq(expectedLocale), (TranslationsResource) notNull(), eq(extensionSet), eq("auto"))).andReturn(mockOKResponse);
       }
       FliesClientRequestFactory mockRequestFactory = EasyMock.createNiceMock(FliesClientRequestFactory.class);
 

diff --git a/client/zanata-maven-plugin/src/main/java/net/openl10n/flies/maven/PublicanPushMojo.java b/client/zanata-maven-plugin/src/main/java/net/openl10n/flies/maven/PublicanPushMojo.java
@@ -53,7 +53,7 @@ public PublicanPushCommand initCommand()
    private String sourceLang = "en-US";
 
    /**
-    * Import translations from local PO files to the server, overwriting or erasing
+    * Import/merge translations from local PO files to the server, overwriting or erasing
     * existing translations (DANGER!)
     * 
     * @parameter expression="${zanata.importPo}"
@@ -73,6 +73,13 @@ public PublicanPushCommand initCommand()
     */
    private boolean validate;
 
+   /**
+    * Merge type: "auto" (default) or "import" (DANGER!).  
+    * 
+    * @parameter expression="${zanata.merge}" default-value="auto"
+    */
+   private String merge;
+
    @Override
    public File getSrcDir()
    {
@@ -107,5 +114,11 @@ public boolean getValidate()
    {
       return validate;
    }
+
+   @Override
+   public String getMergeType()
+   {
+      return merge;
+   }
 
 }
diff --git a/.../flies-common-api/src/main/java/net/openl10n/flies/rest/client/ITranslationResources.java b/.../flies-common-api/src/main/java/net/openl10n/flies/rest/client/ITranslationResources.java
@@ -67,5 +67,9 @@ public interface ITranslationResources
    @PUT
    @Path("{id}/translations/{locale}")
    public ClientResponse<String> putTranslations(@PathParam("id") String idNoSlash, @PathParam("locale") LocaleId locale, TranslationsResource messageBody, @QueryParam("ext") StringSet extensions);
+
+   @PUT
+   @Path("{id}/translations/{locale}")
+   public ClientResponse<String> putTranslations(@PathParam("id") String idNoSlash, @PathParam("locale") LocaleId locale, TranslationsResource messageBody, @QueryParam("ext") StringSet extensions, @QueryParam("merge") String mergeType);
 
 }