From: Andreas Müller Date: Mon, 29 Jun 2020 07:24:02 +0000 (+0200) Subject: rename deproxy to deproxyIfInitialized X-Git-Tag: 5.16.0^2~18 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0dd61d7a26b518ca822044a0cb55483fea9ce348 rename deproxy to deproxyIfInitialized --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java index e9c3f4c57..a6b66ad47 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java @@ -1336,8 +1336,8 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers throw new HibernateException("commonService not initialized (null)"); } - //Object obj = ProxyUtils.deproxy(cachedCommonService.initializeCollection(this)); - Object obj = ProxyUtils.deproxy(cachedCommonService.initializeCollection(cdmBase.getUuid(), fieldName)); + //Object obj = ProxyUtils.deproxyIfInitialized(cachedCommonService.initializeCollection(this)); + Object obj = ProxyUtils.deproxyIfInitialized(cachedCommonService.initializeCollection(cdmBase.getUuid(), fieldName)); if(ProxyUtils.isUninitializedProxy(obj)) { throw new HibernateException("Persistent Collection initialized but is still a proxy"); } 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 4bc3affc2..c02ac9718 100644 --- 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 @@ -62,11 +62,11 @@ 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<>(); taxonNodes.add(taxonNode1); @@ -89,11 +89,11 @@ 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<>(); taxonNodes.add(taxonNode1); @@ -122,11 +122,11 @@ 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<>(); taxonNodes.add(taxonNode1); @@ -157,7 +157,7 @@ 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<>();