Properly handle notes field in CLI and maven plugin

Updated gp-java-client version to 1.1.3.

Changed CLI export command to read notes field, although current export
command really does not use the value.

Updated CLI import command to store notes field values parsed by the new
gp-res-filter.

Maven gp:upload to import notes field values returned by gp-res-filter
as well.

Author: Yoshito Umaoka

gp-cli/pom.xml

@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>
 			<artifactId>gp-java-client</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</dependency>
 
 		<dependency>

gp-cli/src/main/java/com/ibm/g11n/pipeline/tools/cli/ExportCmd.java

@@ -29,6 +29,7 @@
 import com.ibm.g11n.pipeline.resfilter.Bundle;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilter;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilterFactory;
+import com.ibm.g11n.pipeline.resfilter.ResourceString;
 import com.ibm.g11n.pipeline.resfilter.ResourceType;
 
 /**
@@ -89,7 +90,9 @@ protected void _execute() {
                     if (seqNum != null) {
                         sequenceNumber = seqNum.intValue();
                     }
-                    bundle.addResourceString(key, resVal, sequenceNumber);
+                    ResourceString resString = new ResourceString(key, resVal,
+                            sequenceNumber, data.getNotes());
+                    bundle.addResourceString(resString);
                 }
             }
         } catch (ServiceException e) {

gp-cli/src/main/java/com/ibm/g11n/pipeline/tools/cli/ImportCmd.java

@@ -71,6 +71,7 @@ protected void _execute() {
                 if (seqNum >= 0) {
                     resEntryData.setSequenceNumber(Integer.valueOf(seqNum));
                 }
+                resEntryData.setNotes(resString.getNotes());
                 resEntries.put(resString.getKey(), resEntryData);
             }
         } catch (IOException e) {

gp-maven-plugin/pom.xml

@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>
 			<artifactId>gp-java-client</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.g11n.pipeline</groupId>

gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPUploadMojo.java

@@ -70,6 +70,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                     // Checks if the bundle already exists
                     String bundleId = bf.getBundleId();
+                    boolean createNew = false;
                     if (bundleIds.contains(bundleId)) {
                         getLog().info("Found bundle:" + bundleId);
                         // Checks if the source language matches.
@@ -82,12 +83,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                         }
                     } else {
                         getLog().info("bundle:" + bundleId + " does not exist, creating a new bundle.");
-                        NewBundleData newBundleData = new NewBundleData(srcLang);
-                        if (!tgtLangs.isEmpty()) {
-                            newBundleData.setTargetLanguages(new TreeSet<String>(tgtLangs));
-                        }
-                        client.createBundle(bundleId, newBundleData);
-                        getLog().info("Created bundle: " + bundleId);
+                        createNew = true;
                     }
 
                     // Parse the resource bundle file
@@ -96,13 +92,27 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                     try (FileInputStream fis = new FileInputStream(bf.getFile())) {
                         Bundle resBundle = filter.parse(fis);
+
+                        if (createNew) {
+                            NewBundleData newBundleData = new NewBundleData(srcLang);
+                            // set target languages
+                            if (!tgtLangs.isEmpty()) {
+                                newBundleData.setTargetLanguages(new TreeSet<String>(tgtLangs));
+                            }
+                            // set bundle notes
+                            newBundleData.setNotes(resBundle.getNotes());
+                            client.createBundle(bundleId, newBundleData);
+                            getLog().info("Created bundle: " + bundleId);
+                        }
                         Collection<ResourceString> resStrings = resBundle.getResourceStrings();
                         for (ResourceString resString : resStrings) {
                             NewResourceEntryData resEntryData = new NewResourceEntryData(resString.getValue());
                             int seqNum = resString.getSequenceNumber();
                             if (seqNum >= 0) {
                                 resEntryData.setSequenceNumber(Integer.valueOf(seqNum));
                             }
+                            // set resource string notes
+                            resEntryData.setNotes(resString.getNotes());
                             resEntries.put(resString.getKey(), resEntryData);
                         }
                     } catch (IOException e) {