Author: kmorin Date: 2014-08-07 18:11:14 +0200 (Thu, 07 Aug 2014) New Revision: 494 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/494 Log: integration des fetchs Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-08-07 15:54:09 UTC (rev 493) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-08-07 16:11:14 UTC (rev 494) @@ -37,7 +37,7 @@ # DemandType com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true -com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.fields.tagvalue.unique=true +com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.fields.stereotype=unique # Client com.franciaflex.faxtomail.persistence.entities.Client.attribute.brand.tagvalue.naturalId=true @@ -88,7 +88,7 @@ # History com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true -com.franciaflex.faxtomail.persistence.entities.History.attribute.fields.tagvalue.unique=true +com.franciaflex.faxtomail.persistence.entities.History.attribute.fields.stereotype=unique # FaxToMailUser com.franciaflex.faxtomail.persistence.entities.FaxToMailUser.attribute.login.tagvalue.naturalId=true Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-07 15:54:09 UTC (rev 493) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-07 16:11:14 UTC (rev 494) @@ -494,7 +494,7 @@ .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) .addAllFetches( Email.PROPERTY_DEMAND_TYPE, -// Email.PROPERTY_DEMAND_TYPE + "." + DemandType.PROPERTY_FIELDS, + Email.PROPERTY_DEMAND_TYPE + "." + DemandType.PROPERTY_FIELDS, Email.PROPERTY_RANGE_ROW, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_HISTORY, @@ -511,12 +511,6 @@ ) .findPage(page); - // fetch fields manually to avoid a multiple bags exception in the previous query - for (Email email : result.getElements()) { - if (email.getDemandType() != null) { - Hibernate.initialize(email.getDemandType().getFields()); - } - } } else { List<Email> elements = Collections.emptyList(); result = PaginationResult.of(elements, 0, page);