rhbz1002774 - minor refactor and fix HTextFlowHistoryJPATest

zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java

@@ -1317,9 +1317,9 @@ public String decodeDocId(String id)
     * @param apiVersion
     * @todo merge with {@link #transferToTextFlowTargetExtensions}
     */
-   public void transferToTextFlowTarget(HTextFlowTarget from, TextFlowTarget to, boolean isPlural, Optional<String> apiVersion)
+   public void transferToTextFlowTarget(HTextFlowTarget from, TextFlowTarget to, Optional<String> apiVersion)
    {
-      if (isPlural)
+      if (from.getTextFlow().isPlural())
       {
          to.setContents(from.getContents());
       }
@@ -1399,7 +1399,7 @@ public boolean transferToTranslationsResource(TranslationsResource transRes, HDo
          found = true;
          TextFlowTarget target = new TextFlowTarget();
          target.setResId(hTarget.getTextFlow().getResId());
-         this.transferToTextFlowTarget(hTarget, target, hTarget.getTextFlow().isPlural(), apiVersion);
+         this.transferToTextFlowTarget(hTarget, target, apiVersion);
          this.transferToTextFlowTargetExtensions(hTarget, target.getExtensions(true), enabledExtensions);
          transRes.getTextFlowTargets().add(target);
       }

zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java

@@ -84,6 +84,7 @@ public void ensureHistoryIsRecordedPlural()
       session.flush();
 
       HTextFlow tf = new HTextFlow(d, "mytf", "hello world");
+      tf.setPlural(false);
       d.getTextFlows().add(tf);
 
       session.flush();
@@ -93,6 +94,7 @@ public void ensureHistoryIsRecordedPlural()
       assertThat("Incorrect History size on persist", historyElems.size(), is(0));
 
       d.incrementRevision();
+      tf.setPlural(true);
       tf.setContents("hello world 1", "hello world 2");
       tf.setRevision(d.getRevision());
       session.flush();