Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

cleanup, whitespace, STS warnings

  • Loading branch information...
commit 54dffdf3d6d560190735cd7c4a5ce77e6dc77a24 1 parent 518be48
authored January 09, 2013

Showing 290 changed files with 2,543 additions and 3,103 deletions. Show diff stats Hide diff stats

  1. 2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/TPCacheAdapterRepository.java
  2. 2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/exception/CacheException.java
  3. 2  ...ls-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/impl/TPCacheAdapterRepositoryImpl.java
  4. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentList.java
  5. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentSortedSet.java
  6. 25  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/AbstractGormMappingFactory.java
  7. 6  ...atastore-core/src/main/groovy/org/grails/datastore/mapping/config/groovy/MappingConfigurationBuilder.groovy
  8. 5  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractDatastore.java
  9. 18  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractSession.java
  10. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/DatastoreUtils.java
  11. 4  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/IdentityGenerationException.java
  12. 9  ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/document/config/DocumentPersistentEntity.java
  13. 43  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/EntityPersister.java
  14. 159  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/NativeEntryEntityPersister.java
  15. 20  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/EventType.java
  16. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/PostLoadEvent.java
  17. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/SaveOrUpdateEvent.java
  18. 34  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/internal/MappingUtils.java
  19. 1  ...ore/src/main/groovy/org/grails/datastore/mapping/engine/types/AbstractMappingAwareCustomTypeMarshaller.java
  20. 7  ...e-core/src/main/groovy/org/grails/datastore/mapping/keyvalue/mapping/config/GormKeyValueMappingFactory.java
  21. 2  ...store-core/src/main/groovy/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.java
  22. 48  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractMappingContext.java
  23. 3  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java
  24. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/EmbeddedPersistentEntity.java
  25. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/IdentityMapping.java
  26. 4  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/IllegalMappingException.java
  27. 25  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/MappingFactory.java
  28. 2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentProperty.java
  29. 52  ...astore-core/src/main/groovy/org/grails/datastore/mapping/model/config/GormMappingConfigurationStrategy.java
  30. 1  ...ls-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/types/BasicTypeConverterRegistrar.java
  31. 13  ...tore-core/src/main/groovy/org/grails/datastore/mapping/model/types/conversion/DefaultConversionService.java
  32. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/proxy/EntityProxy.java
  33. 4  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/proxy/JavassistProxyFactory.java
  34. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Projections.java
  35. 58  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Query.java
  36. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Restrictions.java
  37. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/AssociationCriteria.java
  38. 9  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/Criteria.java
  39. 1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/ProjectionList.java
  40. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/QueryArgumentsAware.java
  41. 41  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/jpa/JpaQueryBuilder.java
  42. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/jpa/JpaQueryInfo.java
  43. 8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/order/ManualEntityOrdering.java
  44. 2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
  45. 2  ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/transactions/DatastoreTransactionManager.java
  46. 5  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/validation/ValidationErrors.java
  47. 8  ...store-core/src/test/groovy/org/grails/datastore/mapping/keyvalue/mapping/KeyValueMappingFactoryTests.groovy
  48. 5  ...atastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DelayAfterWriteDynamoDBSession.java
  49. 32  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DynamoDBDatastore.java
  50. 5  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DynamoDBSession.java
  51. 6  ...re-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/DynamoDBDomainClassMappedForm.java
  52. 3  ...datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/DynamoDBMappingContext.java
  53. 2  ...store-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/GormDynamoDBMappingFactory.java
  54. 2  ...re-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/AbstractDynamoDBTableResolver.java
  55. 24  ...store-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBAssociationIndexer.java
  56. 14  ...atastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBHiLoIdGenerator.java
  57. 10  ...ore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBTableResolverFactory.java
  58. 8  ...amodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/model/types/DynamoDBTypeConverterRegistrar.java
  59. 38  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/query/DynamoDBQuery.java
  60. 6  ...astore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DataStoreOperationException.java
  61. 24  ...db/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DelayAfterWriteDynamoDBTemplateDecorator.java
  62. 17  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBTemplate.java
  63. 48  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBTemplateImpl.java
  64. 22  grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBUtil.java
  65. 14  grails-datastore-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/GemfireDatastore.java
  66. 6  ...s-datastore-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/engine/GemfireEntityPersister.java
  67. 35  grails-datastore-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/query/GemfireQuery.java
  68. 4  ...db/src/main/groovy/org/grails/datastore/gorm/dynamodb/bean/factory/DynamoDBMappingContextFactoryBean.groovy
  69. 43  ...c/main/groovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBApplicationContextConfigurer.groovy
  70. 19  ...dynamodb/src/main/groovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBMethodsConfigurer.groovy
  71. 3  ...-dynamodb/src/main/groovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBSpringConfigurer.groovy
  72. 7  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/ChildEntity.groovy
  73. 26  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/CommonTypes.groovy
  74. 11  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Country.groovy
  75. 4  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  76. 11  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/DynamoDBCombinationSpec.groovy
  77. 12  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/GroupWithin.groovy
  78. 3  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/InheritanceSpec.groovy
  79. 70  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/LexComparisonSpec.groovy
  80. 12  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  81. 13  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Person.groovy
  82. 14  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Pet.groovy
  83. 11  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/PlantNumericIdValue.groovy
  84. 12  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Publication.groovy
  85. 5  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/SimpleDBHiloSpec.groovy
  86. 9  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/TestEntity.groovy
  87. 11  grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/UniqueGroup.groovy
  88. 30  grails-datastore-gorm-dynamodb/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  89. 23  grails-datastore-gorm-gemfire/src/main/groovy/org/grails/datastore/gorm/gemfire/GemfireGormEnhancer.groovy
  90. 21  grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  91. 12  grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  92. 8  grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/PropertyComparisonQuerySpec.groovy
  93. 2  grails-datastore-gorm-gemfire/src/test/groovy/org/grails/datastore/gorm/gemfire/GemfireUuidSpec.groovy
  94. 22  grails-datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/GormToJpaTransform.java
  95. 19  grails-datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/JpaGormEnhancer.groovy
  96. 7  ...atastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/bean/factory/JpaDatastoreFactoryBean.groovy
  97. 14  ...datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/plugin/support/JpaMethodsConfigurer.groovy
  98. 12  ...-datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/plugin/support/JpaSpringConfigurer.groovy
  99. 24  ...astore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/support/JpaPersistenceContextInterceptor.java
  100. 14  grails-datastore-gorm-jpa/src/test/groovy/grails/gorm/tests/Book.groovy
  101. 10  grails-datastore-gorm-jpa/src/test/groovy/org/grails/datastore/gorm/JpaMappingConfigurationSpec.groovy
  102. 1  grails-datastore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java
  103. 3  ...ls-datastore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/bean/factory/GMongoFactoryBean.java
  104. 6  ...rm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/bean/factory/MongoMappingContextFactoryBean.groovy
  105. 20  ...datastore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/config/MongoDatastoreConfigurer.groovy
  106. 36  ...ore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/plugin/support/MongoMethodsConfigurer.groovy
  107. 11  ...tore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/plugin/support/MongoSpringConfigurer.groovy
  108. 44  grails-datastore-gorm-mongo/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy
  109. 30  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  110. 24  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy
  111. 9  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy
  112. 4  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy
  113. 13  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy
  114. 18  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy
  115. 4  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy
  116. 34  ...e-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy
  117. 14  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy
  118. 13  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy
  119. 13  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy
  120. 5  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy
  121. 24  ...tore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy
  122. 5  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy
  123. 27  ...mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy
  124. 36  ...astore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy
  125. 15  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy
  126. 15  ...e-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy
  127. 3  ...ore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy
  128. 2  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy
  129. 5  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy
  130. 13  ...astore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy
  131. 8  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy
  132. 33  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy
  133. 16  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy
  134. 7  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy
  135. 9  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy
  136. 14  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy
  137. 14  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy
  138. 8  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy
  139. 7  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy
  140. 12  ...ls-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy
  141. 19  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy
  142. 9  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy
  143. 4  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy
  144. 18  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy
  145. 10  grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy
  146. 4  ...upport/src/main/groovy/org/grails/datastore/gorm/plugin/support/AggregatePersistenceContextInterceptor.java
  147. 16  ...tastore-gorm-plugin-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/OnChangeHandler.groovy
  148. 6  ...astore-gorm-plugin-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurer.groovy
  149. 17  ...plugin-support/src/test/groovy/org/grails/datastore/gorm/plugin/support/DynamicMethodsConfigurerSpec.groovy
  150. 6  ...ore-gorm-plugin-support/src/test/groovy/org/grails/datastore/gorm/plugin/support/OnChangeHandlerSpec.groovy
  151. 17  ...re-gorm-plugin-support/src/test/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurerSpec.groovy
  152. 6  grails-datastore-gorm-redis/src/main/groovy/org/grails/datastore/gorm/redis/RedisGormEnhancer.groovy
  153. 2  ...re-gorm-redis/src/main/groovy/org/grails/datastore/gorm/redis/bean/factory/RedisDatastoreFactoryBean.groovy
  154. 2  ...rm-redis/src/main/groovy/org/grails/datastore/gorm/redis/bean/factory/RedisMappingContextFactoryBean.groovy
  155. 8  grails-datastore-gorm-redis/src/test/groovy/grails/gorm/tests/PropertyComparisonQuerySpec.groovy
  156. 3  ...db/src/main/groovy/org/grails/datastore/gorm/simpledb/bean/factory/SimpleDBMappingContextFactoryBean.groovy
  157. 50  ...c/main/groovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBApplicationContextConfigurer.groovy
  158. 24  ...simpledb/src/main/groovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBMethodsConfigurer.groovy
  159. 5  ...-simpledb/src/main/groovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBSpringConfigurer.groovy
  160. 7  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/ChildEntity.groovy
  161. 24  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/CommonTypes.groovy
  162. 11  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Country.groovy
  163. 12  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/GroupWithin.groovy
  164. 4  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/InheritanceSpec.groovy
  165. 69  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/LexComparisonSpec.groovy
  166. 10  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  167. 14  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Person.groovy
  168. 15  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Pet.groovy
  169. 11  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/PlantNumericIdValue.groovy
  170. 12  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Publication.groovy
  171. 7  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/SimpleDBHiloSpec.groovy
  172. 8  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/StringConversionSpec.groovy
  173. 9  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/TestEntity.groovy
  174. 12  grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/UniqueGroup.groovy
  175. 28  grails-datastore-gorm-simpledb/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  176. 4  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CriteriaBuilderSpec.groovy
  177. 2  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DeleteAllSpec.groovy
  178. 14  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  179. 1  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/EnumSpec.groovy
  180. 458  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/FindByMethodSpec.groovy
  181. 67  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/FirstAndLastMethodSpec.groovy
  182. 2  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/GormEnhancerSpec.groovy
  183. 7  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/GroovyProxySpec.groovy
  184. 2  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/InheritanceSpec.groovy
  185. 12  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/PagedResultSpec.groovy
  186. 3  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/QueryByNullSpec.groovy
  187. 16  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/RangeQuerySpec.groovy
  188. 2  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/SaveAllSpec.groovy
  189. 16  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/SizeQuerySpec.groovy
  190. 2  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/TestEnum.groovy
  191. 17  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/UniqueConstraintSpec.groovy
  192. 8  grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ValidationSpec.groovy
  193. 34  grails-datastore-gorm-test/src/main/groovy/grails/datastore/test/DatastoreUnitTestMixin.groovy
  194. 10  grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy
  195. 124  grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy
  196. 8  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy
  197. 14  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy
  198. 17  ...-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy
  199. 7  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy
  200. 12  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy
  201. 12  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy
  202. 11  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy
  203. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy
  204. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy
  205. 13  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy
  206. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy
  207. 11  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy
  208. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy
  209. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy
  210. 8  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy
  211. 11  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy
  212. 10  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy
  213. 24  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy
  214. 17  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy
  215. 11  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy
  216. 11  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy
  217. 22  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy
  218. 9  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy
  219. 2  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy
  220. 2  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy
  221. 26  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  222. 12  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy
  223. 16  grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UniqueConstraintGroupSpec.groovy
  224. 33  grails-datastore-gorm/src/main/groovy/grails/gorm/CriteriaBuilder.java
  225. 101  grails-datastore-gorm/src/main/groovy/grails/gorm/DetachedCriteria.groovy
  226. 18  grails-datastore-gorm/src/main/groovy/grails/gorm/PagedResultList.java
  227. 4  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy
  228. 30  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy
  229. 96  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy
  230. 11  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy
  231. 12  ...astore-gorm/src/main/groovy/org/grails/datastore/gorm/bean/factory/AbstractMappingContextFactoryBean.groovy
  232. 2  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/config/GrailsDomainClassPersistentEntity.java
  233. 29  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java
  234. 2  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java
  235. 18  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java
  236. 52  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java
  237. 4  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java
  238. 4  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java
  239. 15  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java
  240. 10  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java
  241. 2  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java
  242. 5  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java
  243. 39  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java
  244. 16  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
  245. 4  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy
  246. 7  ...-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy
  247. 10  ...store-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java
  248. 487  ...s-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java
  249. 103  grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UniqueConstraint.groovy
  250. 3  grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/JpaDatastore.java
  251. 18  grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/JpaSession.java
  252. 2  ...-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/config/JpaMappingConfigurationStrategy.java
  253. 10  grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/config/JpaPersistentEntity.java
  254. 26  grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/query/JpaQuery.java
  255. 28  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java
  256. 36  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java
  257. 13  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.java
  258. 65  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java
  259. 204  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java
  260. 85  grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java
  261. 12  grails-datastore-mongo/src/test/groovy/org/grails/datastore/mapping/mongo/EnumPersistenceSpec.groovy
  262. 29  grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/engine/RedisEntityPersister.java
  263. 2  grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/engine/RedisPropertyValueIndexer.java
  264. 16  grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/query/RedisQuery.java
  265. 4  grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/util/JedisTemplate.java
  266. 2  grails-datastore-redis/src/test/groovy/org/grails/datastore/mapping/redis/LazyLoadedOneToOneTests.java
  267. 42  grails-datastore-redis/src/test/groovy/org/grails/datastore/mapping/redis/collection/RedisMapTests.groovy
  268. 4  grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/SimpleMapDatastore.java
  269. 2  grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/SimpleMapSession.java
  270. 20  ...datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/engine/SimpleMapEntityPersister.groovy
  271. 53  grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/query/SimpleMapQuery.groovy
  272. 1  grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/query/SimpleMapResultList.groovy
  273. 5  ...atastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/DelayAfterWriteSimpleDBSession.java
  274. 26  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/SimpleDBDatastore.java
  275. 5  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/SimpleDBSession.java
  276. 2  ...store-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/config/GormSimpleDBMappingFactory.java
  277. 3  ...datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/config/SimpleDBMappingContext.java
  278. 2  ...e-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/AbstractSimpleDBDomainResolver.java
  279. 3  ...store-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBAssociationIndexer.java
  280. 1  ...atastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBEntityPersister.java
  281. 14  ...atastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBHiLoIdGenerator.java
  282. 15  ...store-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBIdGeneratorFactory.java
  283. 1  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBNativeItem.java
  284. 1  ...pledb/src/main/groovy/org/grails/datastore/mapping/simpledb/model/types/SimpleDBTypeConverterRegistrar.java
  285. 31  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/query/SimpleDBQuery.java
  286. 11  ...db/src/main/groovy/org/grails/datastore/mapping/simpledb/util/DelayAfterWriteSimpleDBTemplateDecorator.java
  287. 18  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/util/SimpleDBTemplateImpl.java
  288. 10  grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/util/SimpleDBUtil.java
  289. 4  grails-plugins/mongodb/application.properties
  290. 5  grails-plugins/redis/application.properties
2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/TPCacheAdapterRepository.java
@@ -29,7 +29,7 @@
29 29
      * @param entityJavaClass equivalent to {@link PersistentEntity.getJavaClass()}
30 30
      * @param cacheAdapter
31 31
      */
32  
-    void setTPCacheAdapter(Class entityJavaClass, TPCacheAdapter<T> cacheAdapter);
  32
+    void setTPCacheAdapter(@SuppressWarnings("rawtypes") Class entityJavaClass, TPCacheAdapter<T> cacheAdapter);
33 33
 
34 34
     /**
35 35
      * Sets {@link TPCacheAdapter} for the specified FQN java class of {@link PersistentEntity}.
2  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/exception/CacheException.java
@@ -5,6 +5,8 @@
5 5
  * @author Roman Stepanenko
6 6
  */
7 7
 public class CacheException extends RuntimeException{
  8
+    private static final long serialVersionUID = 1;
  9
+
8 10
     public CacheException() {
9 11
     }
10 12
 
2  ...datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/impl/TPCacheAdapterRepositoryImpl.java
@@ -24,7 +24,7 @@ public void setTPCacheAdapter(PersistentEntity entity, TPCacheAdapter<T> cacheAd
24 24
         setTPCacheAdapter(entity.getJavaClass(), cacheAdapter);
25 25
     }
26 26
 
27  
-    public void setTPCacheAdapter(Class entityJavaClass, TPCacheAdapter<T> cacheAdapter) {
  27
+    public void setTPCacheAdapter(@SuppressWarnings("rawtypes") Class entityJavaClass, TPCacheAdapter<T> cacheAdapter) {
28 28
         setTPCacheAdapter(entityJavaClass.getName(), cacheAdapter);
29 29
     }
30 30
 
1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentList.java
@@ -34,7 +34,6 @@
34 34
 
35 35
     private final List list;
36 36
 
37  
-
38 37
     public PersistentList(Class childType, Session session, List collection) {
39 38
         super(childType, session, collection);
40 39
         this.list = collection;
8  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentSortedSet.java
@@ -12,7 +12,7 @@
12 12
  * @author Graeme Rocher
13 13
  * @since 1.0
14 14
  */
15  
-@SuppressWarnings("rawtypes")
  15
+@SuppressWarnings({ "rawtypes", "unchecked" })
16 16
 public class PersistentSortedSet extends AbstractPersistentCollection implements SortedSet {
17 17
 
18 18
     public PersistentSortedSet(Class childType, Session session, SortedSet collection) {
@@ -27,7 +27,6 @@ public PersistentSortedSet(Serializable associationKey, Session session, Associa
27 27
         super(associationKey, session, indexer, new TreeSet());
28 28
     }
29 29
 
30  
-    @Override
31 30
     public Comparator comparator() {
32 31
         return getSortedSet().comparator();
33 32
     }
@@ -37,27 +36,22 @@ private SortedSet getSortedSet() {
37 36
         return ((SortedSet)collection);
38 37
     }
39 38
 
40  
-    @Override
41 39
     public SortedSet subSet(Object o, Object o1) {
42 40
         return getSortedSet().subSet(o,o1);
43 41
     }
44 42
 
45  
-    @Override
46 43
     public SortedSet headSet(Object o) {
47 44
         return getSortedSet().headSet(o);
48 45
     }
49 46
 
50  
-    @Override
51 47
     public SortedSet tailSet(Object o) {
52 48
         return getSortedSet().tailSet(o);
53 49
     }
54 50
 
55  
-    @Override
56 51
     public Object first() {
57 52
         return getSortedSet().first();
58 53
     }
59 54
 
60  
-    @Override
61 55
     public Object last() {
62 56
         return getSortedSet().last();
63 57
     }
25  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/config/AbstractGormMappingFactory.java
@@ -20,30 +20,34 @@
20 20
 import java.util.HashMap;
21 21
 import java.util.Map;
22 22
 
23  
-import org.grails.datastore.mapping.model.*;
24  
-import org.springframework.beans.BeanUtils;
25 23
 import org.grails.datastore.mapping.config.groovy.MappingConfigurationBuilder;
  24
+import org.grails.datastore.mapping.model.ClassMapping;
  25
+import org.grails.datastore.mapping.model.IdentityMapping;
  26
+import org.grails.datastore.mapping.model.MappingFactory;
  27
+import org.grails.datastore.mapping.model.PersistentEntity;
  28
+import org.grails.datastore.mapping.model.PersistentProperty;
26 29
 import org.grails.datastore.mapping.model.config.GormProperties;
27 30
 import org.grails.datastore.mapping.reflect.ClassPropertyFetcher;
  31
+import org.springframework.beans.BeanUtils;
28 32
 
29 33
 /**
30 34
  * Abstract GORM implementation that uses the GORM MappingConfigurationBuilder to configure entity mappings.
31 35
  *
32 36
  * @author Graeme Rocher
33 37
  */
  38
+@SuppressWarnings({"rawtypes", "unchecked"})
34 39
 public abstract class AbstractGormMappingFactory<R, T> extends MappingFactory<R, T> {
35 40
 
36 41
     protected Map<PersistentEntity, Map<String, T>> entityToPropertyMap = new HashMap<PersistentEntity, Map<String, T>>();
37 42
     private Closure defaultMapping;
38 43
 
39  
-    @SuppressWarnings("unchecked")
40 44
     @Override
41 45
     public R createMappedForm(PersistentEntity entity) {
42 46
         ClassPropertyFetcher cpf = ClassPropertyFetcher.forClass(entity.getJavaClass());
43 47
         R family = BeanUtils.instantiate(getEntityMappedFormType());
44 48
         MappingConfigurationBuilder builder = new MappingConfigurationBuilder(family, getPropertyMappedFormType());
45 49
 
46  
-        if(defaultMapping != null) {
  50
+        if (defaultMapping != null) {
47 51
             builder.evaluate(defaultMapping);
48 52
         }
49 53
         Closure value = cpf.getStaticPropertyValue(GormProperties.MAPPING, Closure.class);
@@ -58,7 +62,6 @@ public R createMappedForm(PersistentEntity entity) {
58 62
         return family;
59 63
     }
60 64
 
61  
-
62 65
     public void setDefaultMapping(Closure defaultMapping) {
63 66
         this.defaultMapping = defaultMapping;
64 67
     }
@@ -70,10 +73,10 @@ public void setDefaultMapping(Closure defaultMapping) {
70 73
     @Override
71 74
     public IdentityMapping createIdentityMapping(ClassMapping classMapping) {
72 75
         Map<String, T> props = entityToPropertyMap.get(classMapping.getEntity());
73  
-        if(props != null) {
  76
+        if (props != null) {
74 77
             T property  = props.get(IDENTITY_PROPERTY);
75 78
             IdentityMapping customIdentityMapping = getIdentityMappedForm(classMapping,property);
76  
-            if(customIdentityMapping != null) {
  79
+            if (customIdentityMapping != null) {
77 80
                 return customIdentityMapping;
78 81
             }
79 82
         }
@@ -85,20 +88,20 @@ protected IdentityMapping getIdentityMappedForm(ClassMapping classMapping, T pro
85 88
     }
86 89
 
87 90
     @Override
88  
-    public T createMappedForm(@SuppressWarnings("rawtypes") PersistentProperty mpp) {
  91
+    public T createMappedForm(PersistentProperty mpp) {
89 92
         Map<String, T> properties = entityToPropertyMap.get(mpp.getOwner());
90 93
         if (properties != null && properties.containsKey(mpp.getName())) {
91 94
             return properties.get(mpp.getName());
92 95
         }
93  
-        else if(properties != null) {
  96
+        else if (properties != null) {
94 97
             Property property  = (Property) properties.get(IDENTITY_PROPERTY);
95  
-            if(property != null && mpp.getName().equals(property.getName())) {
  98
+            if (property != null && mpp.getName().equals(property.getName())) {
96 99
                 return (T) property;
97 100
             }
98 101
         }
99 102
 
100 103
         T defaultMapping = properties != null ? properties.get("*") : null;
101  
-        if(defaultMapping != null) {
  104
+        if (defaultMapping != null) {
102 105
             try {
103 106
                 return (T)((Property)defaultMapping).clone();
104 107
             } catch (CloneNotSupportedException e) {
6  ...store-core/src/main/groovy/org/grails/datastore/mapping/config/groovy/MappingConfigurationBuilder.groovy
@@ -14,8 +14,8 @@
14 14
  */
15 15
 package org.grails.datastore.mapping.config.groovy
16 16
 
17  
-import org.springframework.beans.MutablePropertyValues
18 17
 import org.grails.datastore.mapping.reflect.NameUtils
  18
+import org.springframework.beans.MutablePropertyValues
19 19
 import org.springframework.validation.DataBinder
20 20
 
21 21
 /**
@@ -46,8 +46,6 @@ class MappingConfigurationBuilder {
46 46
             return
47 47
         }
48 48
 
49  
-
50  
-
51 49
         def setterName = NameUtils.getSetterName(name)
52 50
         if (target.respondsTo(setterName)) {
53 51
             target[name] = args.size() == 1 ? args[0] : args
@@ -56,7 +54,7 @@ class MappingConfigurationBuilder {
56 54
             if (args[0] instanceof Map) {
57 55
 
58 56
                 def instance
59  
-                if(properties['*']) {
  57
+                if (properties['*']) {
60 58
                     instance = properties['*'].clone()
61 59
                 }
62 60
                 else {
5  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractDatastore.java
@@ -70,7 +70,6 @@ public AbstractDatastore(MappingContext mappingContext, Map<String, String> conn
70 70
         this.cacheAdapterRepository = cacheAdapterRepository;
71 71
     }
72 72
 
73  
-    @Override
74 73
     public void destroy() throws Exception {
75 74
         ERRORS_MAP.remove();
76 75
         VALIDATE_MAP.remove();
@@ -105,7 +104,7 @@ public final Session connect(Map<String, String> connDetails) {
105 104
      * @param connectionDetails The session details
106 105
      * @return The session object
107 106
      */
108  
-    protected abstract Session createSession(@SuppressWarnings("hiding") Map<String, String> connectionDetails);
  107
+    protected abstract Session createSession(Map<String, String> connectionDetails);
109 108
 
110 109
     public Session getCurrentSession() throws ConnectionNotFoundException {
111 110
         return DatastoreUtils.doGetSession(this, false);
@@ -188,7 +187,7 @@ public boolean skipValidation(final Object o) {
188 187
         return VALIDATE_MAP.get();
189 188
     }
190 189
 
191  
-    protected void initializeConverters(@SuppressWarnings("hiding") MappingContext mappingContext) {
  190
+    protected void initializeConverters(MappingContext mappingContext) {
192 191
         final ConverterRegistry conversionService = mappingContext.getConverterRegistry();
193 192
         BasicTypeConverterRegistrar registrar = new BasicTypeConverterRegistrar();
194 193
         registrar.register(conversionService);
18  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractSession.java
@@ -28,12 +28,6 @@
28 28
 import javax.persistence.FlushModeType;
29 29
 
30 30
 import org.grails.datastore.mapping.cache.TPCacheAdapterRepository;
31  
-import org.grails.datastore.mapping.query.api.QueryableCriteria;
32  
-import org.springframework.beans.BeanWrapper;
33  
-import org.springframework.beans.BeanWrapperImpl;
34  
-import org.springframework.context.ApplicationEventPublisher;
35  
-import org.springframework.dao.DataAccessResourceFailureException;
36  
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
37 31
 import org.grails.datastore.mapping.collection.PersistentCollection;
38 32
 import org.grails.datastore.mapping.core.impl.PendingInsert;
39 33
 import org.grails.datastore.mapping.core.impl.PendingOperation;
@@ -46,7 +40,13 @@
46 40
 import org.grails.datastore.mapping.model.MappingContext;
47 41
 import org.grails.datastore.mapping.model.PersistentEntity;
48 42
 import org.grails.datastore.mapping.query.Query;
  43
+import org.grails.datastore.mapping.query.api.QueryableCriteria;
49 44
 import org.grails.datastore.mapping.transactions.Transaction;
  45
+import org.springframework.beans.BeanWrapper;
  46
+import org.springframework.beans.BeanWrapperImpl;
  47
+import org.springframework.context.ApplicationEventPublisher;
  48
+import org.springframework.dao.DataAccessResourceFailureException;
  49
+import org.springframework.dao.InvalidDataAccessResourceUsageException;
50 50
 import org.springframework.transaction.NoTransactionException;
51 51
 import org.springframework.util.Assert;
52 52
 
@@ -172,8 +172,7 @@ public void cacheEntry(PersistentEntity entity, Serializable key, Object entry)
172 172
         cacheEntry(key, entry, getEntryCache(entity.getJavaClass(), false), false);
173 173
     }
174 174
 
175  
-    protected void cacheEntry(Serializable key, Object entry, Map<Serializable, Object> entryCache,
176  
-            @SuppressWarnings("unused") boolean forDirtyCheck) {
  175
+    protected void cacheEntry(Serializable key, Object entry, Map<Serializable, Object> entryCache, boolean forDirtyCheck) {
177 176
         entryCache.put(key, entry);
178 177
     }
179 178
 
@@ -333,7 +332,7 @@ private boolean hasUpdates() {
333 332
         return !pendingInserts.isEmpty() || !pendingUpdates.isEmpty() || !pendingDeletes.isEmpty();
334 333
     }
335 334
 
336  
-    protected void postFlush(@SuppressWarnings("unused") boolean hasUpdates) {
  335
+    protected void postFlush(boolean hasUpdates) {
337 336
         // do nothing
338 337
     }
339 338
 
@@ -391,7 +390,6 @@ else if (o instanceof PersistentEntity) {
391 390
         return p;
392 391
     }
393 392
 
394  
-    @SuppressWarnings("hiding")
395 393
     protected abstract Persister createPersister(Class cls, MappingContext mappingContext);
396 394
 
397 395
     public boolean contains(Object o) {
1  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/DatastoreUtils.java
@@ -37,6 +37,7 @@
37 37
  * @author Juergen Hoeller
38 38
  * @author Graeme Rocher
39 39
  */
  40
+@SuppressWarnings("rawtypes")
40 41
 public abstract class DatastoreUtils {
41 42
 
42 43
      public static final Log logger = LogFactory.getLog(DatastoreUtils.class);
4  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/IdentityGenerationException.java
@@ -15,13 +15,15 @@
15 15
 package org.grails.datastore.mapping.core;
16 16
 
17 17
 /**
18  
- * Exception thrown when an identity cannot be generated
  18
+ * Thrown when an identity cannot be generated.
19 19
  *
20 20
  * @author Graeme Rocher
21 21
  * @since 1.0
22 22
  */
23 23
 public class IdentityGenerationException extends RuntimeException {
24 24
 
  25
+    private static final long serialVersionUID = 1;
  26
+
25 27
     public IdentityGenerationException(String msg) {
26 28
         super(msg);
27 29
     }
9  ...atastore-core/src/main/groovy/org/grails/datastore/mapping/document/config/DocumentPersistentEntity.java
@@ -15,7 +15,12 @@
15 15
 
16 16
 package org.grails.datastore.mapping.document.config;
17 17
 
18  
-import org.grails.datastore.mapping.model.*;
  18
+import org.grails.datastore.mapping.model.AbstractClassMapping;
  19
+import org.grails.datastore.mapping.model.AbstractPersistentEntity;
  20
+import org.grails.datastore.mapping.model.ClassMapping;
  21
+import org.grails.datastore.mapping.model.IdentityMapping;
  22
+import org.grails.datastore.mapping.model.MappingContext;
  23
+import org.grails.datastore.mapping.model.PersistentEntity;
19 24
 
20 25
 public class DocumentPersistentEntity extends AbstractPersistentEntity<Collection> {
21 26
 
@@ -47,7 +52,7 @@ public Collection getMappedForm() {
47 52
 
48 53
         @Override
49 54
         public IdentityMapping getIdentifier() {
50  
-            if(identityMapping == null) {
  55
+            if (identityMapping == null) {
51 56
                 identityMapping = context.getMappingFactory().createIdentityMapping(this);
52 57
             }
53 58
             return identityMapping;
43  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/EntityPersister.java
@@ -19,12 +19,19 @@
19 19
 import java.util.Date;
20 20
 import java.util.List;
21 21
 
22  
-import org.grails.datastore.mapping.engine.event.*;
23  
-import org.springframework.context.ApplicationEventPublisher;
24 22
 import org.grails.datastore.mapping.core.Session;
  23
+import org.grails.datastore.mapping.engine.event.PostDeleteEvent;
  24
+import org.grails.datastore.mapping.engine.event.PostInsertEvent;
  25
+import org.grails.datastore.mapping.engine.event.PostLoadEvent;
  26
+import org.grails.datastore.mapping.engine.event.PostUpdateEvent;
  27
+import org.grails.datastore.mapping.engine.event.PreDeleteEvent;
  28
+import org.grails.datastore.mapping.engine.event.PreInsertEvent;
  29
+import org.grails.datastore.mapping.engine.event.PreLoadEvent;
  30
+import org.grails.datastore.mapping.engine.event.PreUpdateEvent;
25 31
 import org.grails.datastore.mapping.model.MappingContext;
26 32
 import org.grails.datastore.mapping.model.PersistentEntity;
27 33
 import org.grails.datastore.mapping.proxy.ProxyFactory;
  34
+import org.springframework.context.ApplicationEventPublisher;
28 35
 
29 36
 /**
30 37
  * A {@link org.grails.datastore.mapping.engine.Persister} specifically for persisting PersistentEntity instances.
@@ -88,7 +95,7 @@ public Class getType() {
88 95
      * @return The identifier or null if it doesn't have one
89 96
      */
90 97
     public Serializable getObjectIdentifier(Object obj) {
91  
-        if(obj == null) return null;
  98
+        if (obj == null) return null;
92 99
         final ProxyFactory pf = getProxyFactory();
93 100
         if (pf.isProxy(obj)) {
94 101
             return pf.getIdentifier(obj);
@@ -196,11 +203,11 @@ public void delete(Object obj) {
196 203
 
197 204
     protected abstract void deleteEntities(PersistentEntity pe, @SuppressWarnings("rawtypes") Iterable objects);
198 205
 
199  
-    protected EntityAccess createEntityAccess(@SuppressWarnings("unused") PersistentEntity pe, Object obj) {
  206
+    protected EntityAccess createEntityAccess(PersistentEntity pe, Object obj) {
200 207
         return new EntityAccess(persistentEntity, obj);
201 208
     }
202 209
 
203  
-    protected Object newEntityInstance(@SuppressWarnings("hiding") PersistentEntity persistentEntity) {
  210
+    protected Object newEntityInstance(PersistentEntity persistentEntity) {
204 211
         Object o = persistentEntity.newInstance();
205 212
         publisher.publishEvent(new PreLoadEvent(session.getDatastore(), getPersistentEntity(),
206 213
                 new EntityAccess(persistentEntity, o)));
@@ -213,15 +220,13 @@ protected Object newEntityInstance(@SuppressWarnings("hiding") PersistentEntity
213 220
     * @param entityAccess The entity access
214 221
     * @return true if the operation should be cancelled
215 222
     */
216  
-    public boolean cancelInsert(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
217  
-           final EntityAccess entityAccess) {
  223
+    public boolean cancelInsert(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
218 224
        PreInsertEvent event = new PreInsertEvent(session.getDatastore(), persistentEntity, entityAccess);
219 225
        publisher.publishEvent(event);
220 226
        return event.isCancelled();
221 227
    }
222 228
 
223  
-    public void firePostInsertEvent(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
224  
-            final EntityAccess entityAccess) {
  229
+    public void firePostInsertEvent(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
225 230
         publisher.publishEvent(new PostInsertEvent(
226 231
                 session.getDatastore(), persistentEntity, entityAccess));
227 232
     }
@@ -232,8 +237,7 @@ public void firePostInsertEvent(@SuppressWarnings("hiding") final PersistentEnti
232 237
     * @param entityAccess The entity access
233 238
     * @return true if the operation should be cancelled
234 239
     */
235  
-    public boolean cancelUpdate(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
236  
-           final EntityAccess entityAccess) {
  240
+    public boolean cancelUpdate(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
237 241
        PreUpdateEvent event = new PreUpdateEvent(session.getDatastore(), persistentEntity, entityAccess);
238 242
        publisher.publishEvent(event);
239 243
        return event.isCancelled();
@@ -245,33 +249,28 @@ public boolean cancelUpdate(@SuppressWarnings("hiding") final PersistentEntity p
245 249
      * @param entityAccess The entity access
246 250
      * @return true if the operation should be cancelled
247 251
      */
248  
-    public boolean cancelDelete( final PersistentEntity persistentEntity,
249  
-                                 final EntityAccess entityAccess) {
  252
+    public boolean cancelDelete( final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
250 253
         PreDeleteEvent event = new PreDeleteEvent(session.getDatastore(), persistentEntity, entityAccess);
251 254
         publisher.publishEvent(event);
252 255
         return event.isCancelled();
253 256
     }
254 257
 
255  
-    public void firePostUpdateEvent(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
256  
-            final EntityAccess entityAccess) {
  258
+    public void firePostUpdateEvent(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
257 259
         publisher.publishEvent(new PostUpdateEvent(
258 260
                 session.getDatastore(), persistentEntity, entityAccess));
259 261
     }
260 262
 
261  
-    public void firePostDeleteEvent(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
262  
-            final EntityAccess entityAccess) {
  263
+    public void firePostDeleteEvent(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
263 264
         publisher.publishEvent(new PostDeleteEvent(
264 265
                 session.getDatastore(), persistentEntity, entityAccess));
265 266
     }
266 267
 
267  
-    public void firePreLoadEvent(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
268  
-            final EntityAccess entityAccess) {
  268
+    public void firePreLoadEvent(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
269 269
         publisher.publishEvent(new PreLoadEvent(
270 270
                 session.getDatastore(), persistentEntity, entityAccess));
271 271
     }
272 272
 
273  
-    public void firePostLoadEvent(@SuppressWarnings("hiding") final PersistentEntity persistentEntity,
274  
-            final EntityAccess entityAccess) {
  273
+    public void firePostLoadEvent(final PersistentEntity persistentEntity, final EntityAccess entityAccess) {
275 274
         publisher.publishEvent(new PostLoadEvent(
276 275
                 session.getDatastore(), persistentEntity, entityAccess));
277 276
     }
@@ -289,7 +288,7 @@ protected boolean isVersioned(final EntityAccess ea) {
289 288
     protected void incrementVersion(final EntityAccess ea) {
290 289
         if (Number.class.isAssignableFrom(ea.getPropertyType("version"))) {
291 290
             Number currentVersion = (Number) ea.getProperty("version");
292  
-            if(currentVersion == null) {
  291
+            if (currentVersion == null) {
293 292
                 currentVersion = 0L;
294 293
             }
295 294
             ea.setProperty("version", currentVersion.longValue() + 1);
159  grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/NativeEntryEntityPersister.java
@@ -15,7 +15,18 @@
15 15
 package org.grails.datastore.mapping.engine;
16 16
 
17 17
 import java.io.Serializable;
18  
-import java.util.*;
  18
+import java.util.ArrayList;
  19
+import java.util.Arrays;
  20
+import java.util.Collection;
  21
+import java.util.Collections;
  22
+import java.util.HashMap;
  23
+import java.util.Iterator;
  24
+import java.util.LinkedHashMap;
  25
+import java.util.LinkedHashSet;
  26
+import java.util.List;
  27
+import java.util.Map;
  28
+import java.util.Set;
  29
+import java.util.SortedSet;
19 30
 
20 31
 import javax.persistence.CascadeType;
21 32
 import javax.persistence.FetchType;
@@ -23,19 +34,11 @@
23 34
 
24 35
 import org.grails.datastore.mapping.cache.TPCacheAdapter;
25 36
 import org.grails.datastore.mapping.cache.TPCacheAdapterRepository;
26  
-import org.grails.datastore.mapping.collection.*;
27  
-import org.grails.datastore.mapping.engine.event.PostDeleteEvent;
28  
-import org.grails.datastore.mapping.engine.event.PreLoadEvent;
29  
-import org.grails.datastore.mapping.engine.internal.MappingUtils;
30  
-import org.grails.datastore.mapping.engine.types.CustomTypeMarshaller;
31  
-import org.grails.datastore.mapping.model.*;
32  
-import org.grails.datastore.mapping.model.types.*;
33  
-import org.grails.datastore.mapping.query.Query;
34  
-import org.springframework.beans.BeanWrapper;
35  
-import org.springframework.beans.PropertyAccessorFactory;
36  
-import org.springframework.beans.SimpleTypeConverter;
37  
-import org.springframework.context.ApplicationEventPublisher;
38  
-import org.springframework.dao.CannotAcquireLockException;
  37
+import org.grails.datastore.mapping.collection.AbstractPersistentCollection;
  38
+import org.grails.datastore.mapping.collection.PersistentCollection;
  39
+import org.grails.datastore.mapping.collection.PersistentList;
  40
+import org.grails.datastore.mapping.collection.PersistentSet;
  41
+import org.grails.datastore.mapping.collection.PersistentSortedSet;
39 42
 import org.grails.datastore.mapping.config.Property;
40 43
 import org.grails.datastore.mapping.core.Session;
41 44
 import org.grails.datastore.mapping.core.SessionImplementor;
@@ -47,7 +50,28 @@
47 50
 import org.grails.datastore.mapping.core.impl.PendingUpdate;
48 51
 import org.grails.datastore.mapping.core.impl.PendingUpdateAdapter;
49 52
 import org.grails.datastore.mapping.engine.event.PreDeleteEvent;
  53
+import org.grails.datastore.mapping.engine.internal.MappingUtils;
  54
+import org.grails.datastore.mapping.engine.types.CustomTypeMarshaller;
  55
+import org.grails.datastore.mapping.model.ClassMapping;
  56
+import org.grails.datastore.mapping.model.EmbeddedPersistentEntity;
  57
+import org.grails.datastore.mapping.model.MappingContext;
  58
+import org.grails.datastore.mapping.model.PersistentEntity;
  59
+import org.grails.datastore.mapping.model.PersistentProperty;
  60
+import org.grails.datastore.mapping.model.PropertyMapping;
  61
+import org.grails.datastore.mapping.model.types.Association;
  62
+import org.grails.datastore.mapping.model.types.Basic;
  63
+import org.grails.datastore.mapping.model.types.Custom;
  64
+import org.grails.datastore.mapping.model.types.Embedded;
  65
+import org.grails.datastore.mapping.model.types.EmbeddedCollection;
  66
+import org.grails.datastore.mapping.model.types.ManyToMany;
  67
+import org.grails.datastore.mapping.model.types.OneToMany;
  68
+import org.grails.datastore.mapping.model.types.Simple;
  69
+import org.grails.datastore.mapping.model.types.ToOne;
50 70
 import org.grails.datastore.mapping.proxy.ProxyFactory;
  71
+import org.grails.datastore.mapping.query.Query;
  72
+import org.springframework.beans.SimpleTypeConverter;
  73
+import org.springframework.context.ApplicationEventPublisher;
  74
+import org.springframework.dao.CannotAcquireLockException;
51 75
 
52 76
 /**
53 77
  * Provides an implementation of the {@link org.grails.datastore.mapping.engine.EntityPersister} class that
@@ -206,12 +230,13 @@ else if (prop instanceof ToOne) {
206 230
                 ToOne association = (ToOne) prop;
207 231
                 if (!(prop instanceof Embedded) && !(prop instanceof EmbeddedCollection) &&
208 232
                         association.doesCascade(CascadeType.REMOVE)) {
209  
-                    if(association.isOwningSide()) {
  233
+                    if (association.isOwningSide()) {
210 234
                         Object value = entityAccess.getProperty(association.getName());
211  
-                        if(value != null) {
  235
+                        if (value != null) {
212 236
                             Persister persister = session.getPersister(value);
213  
-                            if(persister != null)
  237
+                            if (persister != null) {
214 238
                                 persister.delete(value);
  239
+                            }
215 240
                         }
216 241
                     }
217 242
                 }
@@ -378,8 +403,7 @@ protected void refreshObjectStateFromNativeEntry(PersistentEntity persistentEnti
378 403
                                                      Serializable nativeKey, T nativeEntry, boolean isEmbedded) {
379 404
         EntityAccess ea = createEntityAccess(persistentEntity, obj, nativeEntry);
380 405
         ea.setConversionService(getMappingContext().getConversionService());
381  
-        if(!(persistentEntity instanceof EmbeddedPersistentEntity)) {
382  
-
  406
+        if (!(persistentEntity instanceof EmbeddedPersistentEntity)) {
383 407
             String idName = ea.getIdentifierName();
384 408
             ea.setProperty(idName, nativeKey);
385 409
         }
@@ -391,7 +415,7 @@ protected void refreshObjectStateFromNativeEntry(PersistentEntity persistentEnti
391 415
                 // this magically converts most types to the correct property type, using bean converters.
392 416
                 ea.setProperty(prop.getName(), getEntryValue(nativeEntry, propKey));
393 417
             }
394  
-            else if(prop instanceof Basic) {
  418
+            else if (prop instanceof Basic) {
395 419
                 Object entryValue = getEntryValue(nativeEntry, propKey);
396 420
                 entryValue = convertBasicEntryValue(persistentEntity, prop, entryValue);
397 421
                 ea.setProperty(prop.getName(), entryValue);
@@ -436,9 +460,8 @@ else if (prop instanceof ToOne) {
436 460
                         else {
437 461
                             // TODO: handle unidirectional?
438 462
                         }
439  
-
440  
-
441 463
                     }
  464
+
442 465
                     if (isEmbeddedEntry(tmp)) {
443 466
                         PersistentEntity associatedEntity = ((ToOne) prop).getAssociatedEntity();
444 467
                         associatedEntity = discriminatePersistentEntity(associatedEntity, (T) tmp);
@@ -475,8 +498,7 @@ else if (prop instanceof OneToMany) {
475 498
                 Association association = (Association) prop;
476 499
                 PropertyMapping<Property> associationPropertyMapping = association.getMapping();
477 500
 
478  
-
479  
-                if(isEmbedded) {
  501
+                if (isEmbedded) {
480 502
                     List keys = loadEmbeddedCollectionKeys((Association) prop, ea, nativeEntry);
481 503
                     if (List.class.isAssignableFrom(association.getType())) {
482 504
                         ea.setPropertyNoConversion(association.getName(),
@@ -590,7 +612,7 @@ protected Object convertBasicEntryValue(PersistentEntity persistentEntity, Persi
590 612
         // In both cases, we use a BeanWrapper to provide all possible conversions, including those from the
591 613
         // ConversionService as well as standard property editor conversions, etc.
592 614
         // Enums are handled automatically, as are other standard types such as Locale, URI, Integer, etc.
593  
-        if(entryValue instanceof Map) {
  615
+        if (entryValue instanceof Map) {
594 616
             Map nativeMap = (Map) entryValue;
595 617
             LinkedHashMap targetMap = new LinkedHashMap();
596 618
             Class propertyType = prop.getType();
@@ -613,13 +635,13 @@ protected Object convertBasicEntryValue(PersistentEntity persistentEntity, Persi
613 635
 
614 636
             entryValue = targetMap;
615 637
         }
616  
-        else if(entryValue instanceof Collection) {
  638
+        else if (entryValue instanceof Collection) {
617 639
             Collection collection = MappingUtils.createConcreteCollection(prop.getType());
618 640
 
619 641
             Class propertyType = prop.getType();
620 642
             Class genericType = MappingUtils.getGenericTypeForProperty(persistentEntity.getJavaClass(), prop.getName());
621 643
             Collection collectionValue = (Collection) entryValue;
622  
-            if(genericType != null) {
  644
+            if (genericType != null) {
623 645
                 SimpleTypeConverter converter = new SimpleTypeConverter();
624 646
                 converter.setConversionService(getMappingContext().getConversionService());
625 647
                 for (Object o : collectionValue) {
@@ -655,7 +677,6 @@ protected void setEmbeddedCollectionKeys(Association association, EntityAccess e
655 677
         // do nothing
656 678
     }
657 679
 
658  
-
659 680
     /**
660 681
      * Tests whether a native entry is an embedded entry
661 682
      *
@@ -751,11 +772,11 @@ protected final Serializable persistEntity(final PersistentEntity persistentEnti
751 772
         PendingOperation<T, K> pendingOperation;
752 773
 
753 774
         PropertyMapping mapping = persistentEntity.getIdentity().getMapping();
754  
-        if(mapping != null) {
  775
+        if (mapping != null) {
755 776
             Property p = (Property) mapping.getMappedForm();
756 777
             assignedId = p != null && "assigned".equals(p.getGenerator());
757  
-            if(assignedId) {
758  
-                if(isUpdate && !session.contains(obj)) {
  778
+            if (assignedId) {
  779
+                if (isUpdate && !session.contains(obj)) {
759 780
                     isUpdate = false;
760 781
                 }
761 782
             }
@@ -765,8 +786,9 @@ protected final Serializable persistEntity(final PersistentEntity persistentEnti
765 786
         if (!isUpdate) {
766 787
             tmp = createNewEntry(family);
767 788
 
768  
-            if(!assignedId)
  789
+            if (!assignedId) {
769 790
                 k = generateIdentifier(persistentEntity, tmp);
  791
+            }
770 792
 
771 793
             cacheNativeEntry(persistentEntity, (Serializable) k, tmp);
772 794
 
@@ -842,10 +864,10 @@ else if (prop instanceof OneToMany) {
842 864
                     Collection associatedObjects = (Collection) propValue;
843 865
                     if (isInitializedCollection(associatedObjects)) {
844 866
                         EntityPersister associationPersister = (EntityPersister) session.getPersister(oneToMany.getAssociatedEntity());
845  
-                        if(associationPersister != null) {
  867
+                        if (associationPersister != null) {
846 868
                             PersistentCollection persistentCollection;
847 869
                             boolean newCollection = false;
848  
-                            if(associatedObjects instanceof PersistentCollection) {
  870
+                            if (associatedObjects instanceof PersistentCollection) {
849 871
                                 persistentCollection = (PersistentCollection) associatedObjects;
850 872
                             }
851 873
                             else {
@@ -855,17 +877,16 @@ else if (prop instanceof OneToMany) {
855 877
                                 persistentCollection.markDirty();
856 878
                                 newCollection = true;
857 879
                             }
858  
-                            if(persistentCollection.isDirty()) {
  880
+                            if (persistentCollection.isDirty()) {
859 881
                                 persistentCollection.resetDirty();
860 882
                                 List<Serializable> keys = associationPersister.persist(associatedObjects);
861 883
                                 toManyKeys.put(oneToMany, keys);
862  
-                                if(newCollection ) {
  884
+                                if (newCollection ) {
863 885
                                     entityAccess.setProperty(oneToMany.getName(), associatedObjects);
864 886
                                 }
865 887
                             }
866 888
                         }
867 889
                     }
868  
-
869 890
                 }
870 891
             }
871 892
             else if (prop instanceof ManyToMany) {
@@ -874,7 +895,7 @@ else if (prop instanceof ManyToMany) {
874 895
                 final Object propValue = entityAccess.getProperty(manyToMany.getName());
875 896
                 if (propValue instanceof Collection) {
876 897
                     Collection associatedObjects = (Collection) propValue;
877  
-                    if(isInitializedCollection(associatedObjects)) {
  898
+                    if (isInitializedCollection(associatedObjects)) {
878 899
                         setManyToMany(persistentEntity, obj, e, manyToMany, associatedObjects, toManyKeys);
879 900
                     }
880 901
                 }
@@ -890,7 +911,6 @@ else if (prop instanceof ToOne) {
890 911
                 else if (association.doesCascade(CascadeType.PERSIST)) {
891 912
                     final Object associatedObject = entityAccess.getProperty(prop.getName());
892 913
                     if (associatedObject != null) {
893  
-                        @SuppressWarnings("hiding")
894 914
                         Serializable associationId;
895 915
                         NativeEntryEntityPersister associationPersister = (NativeEntryEntityPersister) session.getPersister(associatedObject);
896 916
                         ProxyFactory proxyFactory = getProxyFactory();
@@ -1032,12 +1052,10 @@ public void run() {
1032 1052
     }
1033 1053
 
1034 1054
     private AbstractPersistentCollection getPersistentCollection(Collection associatedObjects, Class associationType) {
1035  
-        if(associatedObjects instanceof Set) {
  1055
+        if (associatedObjects instanceof Set) {
1036 1056
             return associatedObjects instanceof SortedSet ? new PersistentSortedSet(associationType,getSession(), (SortedSet) associatedObjects) : new PersistentSet(associationType, getSession(), associatedObjects);
1037 1057
         }
1038  
-        else {
1039  
-            return new PersistentList(associationType,getSession(), (List) associatedObjects);
1040  
-        }
  1058
+        return new PersistentList(associationType,getSession(), (List) associatedObjects);
1041 1059
     }
1042 1060
 
1043 1061
     private boolean isInitializedCollection(Collection associatedObjects) {
@@ -1061,7 +1079,7 @@ protected void handleEmbeddedToMany(EntityAccess entityAccess, T e, PersistentPr
1061 1079
         // will have to store the embedded entity in an appropriate way (as a sub-document in a document store for example)
1062 1080
         Object embeddedInstances = entityAccess.getProperty(prop.getName());
1063 1081
         if (!(embeddedInstances instanceof Collection) || ((Collection)embeddedInstances).isEmpty()) {
1064  
-            if(embeddedInstances == null)
  1082
+            if (embeddedInstances == null)
1065 1083
                 setEmbeddedCollection(e, key, null, null);
1066 1084
             else {
1067 1085
                 setEmbeddedCollection(e, key, MappingUtils.createConcreteCollection(prop.getType()), new ArrayList<T>());
@@ -1095,7 +1113,7 @@ protected T handleEmbeddedInstance(Association association, Object embeddedInsta
1095 1113
 
1096 1114
         // embeddedPersister would be null if the associated entity is a EmbeddedPersistentEntity
1097 1115
         T embeddedEntry;
1098  
-        if(embeddedPersister == null) {
  1116
+        if (embeddedPersister == null) {
1099 1117
             embeddedEntry = createNewEntry(association.getName());
1100 1118
         }
1101 1119
         else {
@@ -1107,9 +1125,9 @@ protected T handleEmbeddedInstance(Association association, Object embeddedInsta
1107 1125
             final List<PersistentProperty> embeddedProperties = associatedEntity.getPersistentProperties();
1108 1126
             final EntityAccess embeddedEntityAccess = createEntityAccess(associatedEntity, embeddedInstance);
1109 1127
             PersistentProperty identity = associatedEntity.getIdentity();
1110  
-            if(identity != null) {
  1128
+            if (identity != null) {
1111 1129
                 Object embeddedId = embeddedEntityAccess.getProperty(identity.getName());
1112  
-                if(embeddedId != null) {
  1130
+                if (embeddedId != null) {
1113 1131
                     setEntryValue(embeddedEntry, getPropertyKey(identity), embeddedId);
1114 1132
                 }
1115 1133
             }
@@ -1124,7 +1142,7 @@ else if (persistentProperty instanceof Custom) {
1124 1142
                     }
1125 1143
                 }
1126 1144
                 else if (persistentProperty instanceof Association) {
1127  
-                    if(persistentProperty instanceof Embedded) {
  1145
+                    if (persistentProperty instanceof Embedded) {
1128 1146
                         Association toOne = (Association) persistentProperty;
1129 1147
 
1130 1148
                         handleEmbeddedToOne(toOne,getPropertyKey(persistentProperty) , embeddedEntityAccess, embeddedEntry);
@@ -1134,18 +1152,17 @@ else if (persistentProperty instanceof ToOne) {
1134 1152
 
1135 1153
                         Object obj = embeddedEntityAccess.getProperty(toOne.getName());
1136 1154
                         Persister persister = getSession().getPersister(obj);