fix issues

zanata · May 31, 2013 · cd3ee9e · cd3ee9e
1 parent 57684fc
commit cd3ee9e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
@@ -6,25 +6,18 @@
 import org.zanata.common.ContentState;
 import org.zanata.dao.TextFlowTargetHistoryDAO;
 import org.zanata.model.HTextFlowTarget;
-import org.zanata.rest.dto.extensions.comment.SimpleComment;
-import org.zanata.rest.dto.extensions.gettext.TextFlowTargetExtension;
-import org.zanata.rest.dto.resource.ExtensionSet;
 import org.zanata.rest.dto.resource.TextFlowTarget;
 import org.zanata.service.TranslationMergeService;
-import org.zanata.transformer.TargetCommentTransformer;
 import org.zanata.transformer.TargetTransformer;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * @author Patrick Huang <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
-@Slf4j
 class TranslationMergeAuto implements TranslationMergeService
 {
-   private TextFlowTargetHistoryDAO textFlowTargetHistoryDAO;
+   private final TextFlowTargetHistoryDAO textFlowTargetHistoryDAO;
 
-   public TranslationMergeAuto(TextFlowTargetHistoryDAO textFlowTargetHistoryDAO)
+   TranslationMergeAuto(TextFlowTargetHistoryDAO textFlowTargetHistoryDAO)
    {
       this.textFlowTargetHistoryDAO = textFlowTargetHistoryDAO;
    }

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
@@ -29,13 +29,8 @@ public class TranslationMergeServiceFactory
 {
    @In
    private TextFlowTargetHistoryDAO textFlowTargetHistoryDAO;
-   private TranslationMergeAuto translationMergeAuto;
 
-   @Create
-   public void createMergeAuto()
-   {
-      translationMergeAuto = new TranslationMergeAuto(textFlowTargetHistoryDAO);
-   }
+   private TranslationMergeAuto translationMergeAuto;
 
    public TranslationMergeService getMergeService(MergeContext mergeContext)
    {
@@ -45,7 +40,7 @@ public TranslationMergeService getMergeService(MergeContext mergeContext)
       }
       if (mergeContext.mergeType == MergeType.AUTO)
       {
-         return translationMergeAuto;
+         return ensureMergeAuto();
       }
       else if (mergeContext.mergeType == MergeType.IMPORT)
       {
@@ -54,6 +49,15 @@ else if (mergeContext.mergeType == MergeType.IMPORT)
       throw new UnsupportedOperationException("merge unsupported: " + mergeContext);
    }
 
+   private TranslationMergeService ensureMergeAuto()
+   {
+      if (translationMergeAuto == null)
+      {
+         translationMergeAuto = new TranslationMergeAuto(textFlowTargetHistoryDAO);
+      }
+      return translationMergeAuto;
+   }
+
    @Getter
    @AllArgsConstructor
    @ToString

diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
@@ -5,6 +5,7 @@
 import org.testng.annotations.Test;
 import org.zanata.common.MergeType;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.seam.SeamAutowire;
 import org.zanata.service.TranslationMergeService;
 
 import static org.hamcrest.MatcherAssert.*;
@@ -20,8 +21,7 @@ public class TranslationMergeServiceFactoryTest
    @BeforeClass
    public void beforeClass()
    {
-      factory = new TranslationMergeServiceFactory();
-      factory.createMergeAuto();
+      factory = SeamAutowire.instance().ignoreNonResolvable().autowire(TranslationMergeServiceFactory.class);
    }
 
    @Test