[zanata/zanata-platform] 4a5fb7: ZNTA-1865 add test and refactor

[GitHub]

  Branch: refs/heads/ZNTA-1865-version-tm-merge
  Home:   https://github.com/zanata/zanata-platform
  Commit: 4a5fb71ea3ec152fdac0097c8f2e83d8bca31b7b
      https://github.com/zanata/zanata-platform/commit/4a5fb71ea3ec152fdac0097c8f2e83d8bca31b7b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M server/gwt-editor/src/main/java/org/zanata/webtrans/shared/rest/dto/TransMemoryMergeRequest.java
    M server/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    A server/zanata-war/src/main/java/org/zanata/rest/dto/VersionTMMerge.java
    M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M server/zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionTest.java
    M server/zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml

  Log Message:
  -----------
  ZNTA-1865 add test and refactor


  Commit: 2e09a2976b26a74bec82478bc8aa01296c7a5555
      https://github.com/zanata/zanata-platform/commit/2e09a2976b26a74bec82478bc8aa01296c7a5555
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationLocalesResource.java
    M api/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java

  Log Message:
  -----------
  add comment to differentiate two similar APIs


  Commit: 98ca6c73f2d76f61b97bcd4228775f937dbc7afe
      https://github.com/zanata/zanata-platform/commit/98ca6c73f2d76f61b97bcd4228775f937dbc7afe
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M api/zanata-common-api/src/main/java/org/zanata/rest/dto/SearchResult.java
    M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectSearchResult.java
    A server/zanata-war/src/main/java/org/zanata/rest/search/dto/ProjectVersionSearchResult.java
    M server/zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java

  Log Message:
  -----------
  ZNTA-1865 add versions to project search result


Compare: https://github.com/zanata/zanata-platform/compare/716af8eb6a51...98ca6c73f2d7