[zanata/zanata-server] faf3d5: Use Optional instead of @Nullable

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: faf3d5840e94490e3549f7ee988951fd0fa9ad68
      https://github.com/zanata/zanata-server/commit/faf3d5840e94490e3549f7ee988951fd0fa9ad68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java

  Log Message:
  -----------
  Use Optional instead of @Nullable


  Commit: 3f58fae6e57236032487faa8a228591be88a9c63
      https://github.com/zanata/zanata-server/commit/3f58fae6e57236032487faa8a228591be88a9c63
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java

  Log Message:
  -----------
  Update based on review comments


  Commit: 1d197fc096fcbc56ea799ea56ddc76c122670ae3
      https://github.com/zanata/zanata-server/commit/1d197fc096fcbc56ea799ea56ddc76c122670ae3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Merge branch 'tm-import' of github.com:zanata/zanata into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java


  Commit: 7460c3356ae5860c2213c10580b62ea46a22ddd9
      https://github.com/zanata/zanata-server/commit/7460c3356ae5860c2213c10580b62ea46a22ddd9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java

  Log Message:
  -----------
  Update based on review comments


Compare: https://github.com/zanata/zanata-server/compare/d3f7714c45df...7460c3356ae5