rename deproxy to deproxyIfInitialized

[taxeditor.git] / eu.etaxonomy.taxeditor.test / src / test / java / eu / etaxonomy / taxeditor / operation / RemotingCdmUpdateOperationTest.java

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/RemotingCdmUpdateOperationTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/RemotingCdmUpdateOperationTest.java
index b583aa0598bafe9b990ec5478555b197e9eace1d..c02ac97186ba46c6edd4fd194a1917536651a161 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/RemotingCdmUpdateOperationTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/RemotingCdmUpdateOperationTest.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2015 EDIT
 * European Distributed Institute of Taxonomy
@@ -24,8 +23,8 @@ import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.UpdateResult.Status;
 import eu.etaxonomy.cdm.api.service.dto.CdmEntityIdentifier;
+import eu.etaxonomy.cdm.cache.ProxyUtils;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.remoting.cache.ProxyUtils;
 import eu.etaxonomy.taxeditor.store.operations.RemotingTestUpdateOperation;
 
 /**
@@ -36,7 +35,8 @@ import eu.etaxonomy.taxeditor.store.operations.RemotingTestUpdateOperation;
 @DataSet
 public class RemotingCdmUpdateOperationTest extends BaseOperationTest {
 
-    private static final Logger logger = Logger.getLogger(RemotingCdmUpdateOperationTest.class);
+    @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(RemotingCdmUpdateOperationTest.class);
 
     private static ITaxonNodeService taxonNodeService = getRemoteApplicationController().getTaxonNodeService();
 
@@ -62,13 +62,13 @@ public class RemotingCdmUpdateOperationTest extends BaseOperationTest {
 
     @Test
     public void testUpdateResultWithCdmEntities() throws ExecutionException {
-        TaxonNode taxonNode1 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid1));
-        TaxonNode taxonNode2 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid2));
-        TaxonNode taxonNode3 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid3));
-        TaxonNode taxonNode4 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid4));
-        TaxonNode taxonNode5 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid5));
+        TaxonNode taxonNode1 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid1));
+        TaxonNode taxonNode2 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid2));
+        TaxonNode taxonNode3 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid3));
+        TaxonNode taxonNode4 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid4));
+        TaxonNode taxonNode5 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid5));
 
-        taxonNodes = new HashSet<TaxonNode>();
+        taxonNodes = new HashSet<>();
         taxonNodes.add(taxonNode1);
         taxonNodes.add(taxonNode2);
         taxonNodes.add(taxonNode3);
@@ -89,20 +89,20 @@ public class RemotingCdmUpdateOperationTest extends BaseOperationTest {
 
     @Test
     public void testUpdateResultWithCdmIdentities() throws ExecutionException {
-        TaxonNode taxonNode1 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid1));
-        TaxonNode taxonNode2 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid2));
-        TaxonNode taxonNode3 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid3));
-        TaxonNode taxonNode4 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid4));
-        TaxonNode taxonNode5 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid5));
+        TaxonNode taxonNode1 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid1));
+        TaxonNode taxonNode2 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid2));
+        TaxonNode taxonNode3 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid3));
+        TaxonNode taxonNode4 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid4));
+        TaxonNode taxonNode5 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid5));
 
-        taxonNodes = new HashSet<TaxonNode>();
+        taxonNodes = new HashSet<>();
         taxonNodes.add(taxonNode1);
         taxonNodes.add(taxonNode2);
         taxonNodes.add(taxonNode3);
         taxonNodes.add(taxonNode4);
         taxonNodes.add(taxonNode5);
 
-        ceis = new HashSet<CdmEntityIdentifier>();
+        ceis = new HashSet<>();
         ceis.add(new CdmEntityIdentifier(taxonNode3.getId(),TaxonNode.class));
         ceis.add(new CdmEntityIdentifier(taxonNode4.getId(),TaxonNode.class));
         ceis.add(new CdmEntityIdentifier(taxonNode5.getId(),TaxonNode.class));
@@ -122,20 +122,20 @@ public class RemotingCdmUpdateOperationTest extends BaseOperationTest {
 
     @Test
     public void testUpdateResultWithLoadedCdmIdentities() throws ExecutionException {
-        TaxonNode taxonNode1 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid1));
-        TaxonNode taxonNode2 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid2));
-        TaxonNode taxonNode3 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid3));
-        TaxonNode taxonNode4 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid4));
-        TaxonNode taxonNode5 = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid5));
+        TaxonNode taxonNode1 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid1));
+        TaxonNode taxonNode2 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid2));
+        TaxonNode taxonNode3 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid3));
+        TaxonNode taxonNode4 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid4));
+        TaxonNode taxonNode5 = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid5));
 
-        taxonNodes = new HashSet<TaxonNode>();
+        taxonNodes = new HashSet<>();
         taxonNodes.add(taxonNode1);
         taxonNodes.add(taxonNode2);
         taxonNodes.add(taxonNode3);
         taxonNodes.add(taxonNode4);
         taxonNodes.add(taxonNode5);
 
-        ceis = new HashSet<CdmEntityIdentifier>();
+        ceis = new HashSet<>();
         ceis.add(new CdmEntityIdentifier(taxonNode3.getId(),TaxonNode.class));
         ceis.add(new CdmEntityIdentifier(taxonNode4.getId(),TaxonNode.class));
         ceis.add(new CdmEntityIdentifier(taxonNode5.getId(),TaxonNode.class));
@@ -157,10 +157,10 @@ public class RemotingCdmUpdateOperationTest extends BaseOperationTest {
 
     @Test
     public void testDataChange() throws ExecutionException {
-        TaxonNode taxonNode = (TaxonNode) ProxyUtils.deproxy(taxonNodeService.load(taxonNodeUuid1));
+        TaxonNode taxonNode = ProxyUtils.deproxyIfInitialized(taxonNodeService.load(taxonNodeUuid1));
         CdmEntityIdentifier cei = new CdmEntityIdentifier(taxonNode.getId(), TaxonNode.class);
 
-        taxonNodes = new HashSet<TaxonNode>();
+        taxonNodes = new HashSet<>();
         taxonNodes.add(taxonNode);
 
         int taxonNodeCountChildren = taxonNode.getCountChildren();