Permalink
Browse files

cleanup, whitespace, STS warnings

  • Loading branch information...
1 parent 518be48 commit 54dffdf3d6d560190735cd7c4a5ce77e6dc77a24 Burt Beckwith committed Jan 10, 2013
Showing with 2,543 additions and 3,103 deletions.
  1. +1 −1 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/TPCacheAdapterRepository.java
  2. +2 −0 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/cache/exception/CacheException.java
  3. +1 −1 ...re-core/src/main/groovy/org/grails/datastore/mapping/cache/impl/TPCacheAdapterRepositoryImpl.java
  4. +0 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentList.java
  5. +1 −7 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/collection/PersistentSortedSet.java
  6. +14 −11 ...atastore-core/src/main/groovy/org/grails/datastore/mapping/config/AbstractGormMappingFactory.java
  7. +2 −4 ...ore/src/main/groovy/org/grails/datastore/mapping/config/groovy/MappingConfigurationBuilder.groovy
  8. +2 −3 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractDatastore.java
  9. +8 −10 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/AbstractSession.java
  10. +1 −0 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/DatastoreUtils.java
  11. +3 −1 ...datastore-core/src/main/groovy/org/grails/datastore/mapping/core/IdentityGenerationException.java
  12. +7 −2 ...e-core/src/main/groovy/org/grails/datastore/mapping/document/config/DocumentPersistentEntity.java
  13. +21 −22 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/EntityPersister.java
  14. +85 −74 ...atastore-core/src/main/groovy/org/grails/datastore/mapping/engine/NativeEntryEntityPersister.java
  15. +10 −10 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/EventType.java
  16. +0 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/PostLoadEvent.java
  17. +0 −1 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/event/SaveOrUpdateEvent.java
  18. +20 −14 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/engine/internal/MappingUtils.java
  19. +0 −1 ...in/groovy/org/grails/datastore/mapping/engine/types/AbstractMappingAwareCustomTypeMarshaller.java
  20. +4 −3 .../main/groovy/org/grails/datastore/mapping/keyvalue/mapping/config/GormKeyValueMappingFactory.java
  21. +1 −1 .../src/main/groovy/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.java
  22. +21 −27 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractMappingContext.java
  23. +1 −2 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java
  24. +1 −0 ...s-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/EmbeddedPersistentEntity.java
  25. +4 −4 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/IdentityMapping.java
  26. +2 −2 ...ls-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/IllegalMappingException.java
  27. +21 −4 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/MappingFactory.java
  28. +1 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentProperty.java
  29. +32 −20 ...e/src/main/groovy/org/grails/datastore/mapping/model/config/GormMappingConfigurationStrategy.java
  30. +0 −1 ...re-core/src/main/groovy/org/grails/datastore/mapping/model/types/BasicTypeConverterRegistrar.java
  31. +6 −7 ...src/main/groovy/org/grails/datastore/mapping/model/types/conversion/DefaultConversionService.java
  32. +0 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/proxy/EntityProxy.java
  33. +1 −3 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/proxy/JavassistProxyFactory.java
  34. +3 −5 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Projections.java
  35. +26 −32 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Query.java
  36. +0 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/Restrictions.java
  37. +1 −0 ...ls-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/AssociationCriteria.java
  38. +5 −4 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/Criteria.java
  39. +0 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/ProjectionList.java
  40. +3 −5 ...ls-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/api/QueryArgumentsAware.java
  41. +22 −19 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/jpa/JpaQueryBuilder.java
  42. +1 −7 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/query/jpa/JpaQueryInfo.java
  43. +4 −4 ...datastore-core/src/main/groovy/org/grails/datastore/mapping/query/order/ManualEntityOrdering.java
  44. +1 −1 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
  45. +1 −1 ...e-core/src/main/groovy/org/grails/datastore/mapping/transactions/DatastoreTransactionManager.java
  46. +3 −2 grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/validation/ValidationErrors.java
  47. +4 −4 .../src/test/groovy/org/grails/datastore/mapping/keyvalue/mapping/KeyValueMappingFactoryTests.groovy
  48. +3 −2 ...ynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DelayAfterWriteDynamoDBSession.java
  49. +19 −13 ...s-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DynamoDBDatastore.java
  50. +3 −2 grails-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/DynamoDBSession.java
  51. +2 −4 ...b/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/DynamoDBDomainClassMappedForm.java
  52. +2 −1 ...dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/DynamoDBMappingContext.java
  53. +1 −1 ...modb/src/main/groovy/org/grails/datastore/mapping/dynamodb/config/GormDynamoDBMappingFactory.java
  54. +1 −1 ...b/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/AbstractDynamoDBTableResolver.java
  55. +15 −9 ...modb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBAssociationIndexer.java
  56. +7 −7 ...ynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBHiLoIdGenerator.java
  57. +1 −9 ...db/src/main/groovy/org/grails/datastore/mapping/dynamodb/engine/DynamoDBTableResolverFactory.java
  58. +0 −8 ...main/groovy/org/grails/datastore/mapping/dynamodb/model/types/DynamoDBTypeConverterRegistrar.java
  59. +20 −18 ...datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/query/DynamoDBQuery.java
  60. +5 −1 ...amodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DataStoreOperationException.java
  61. +11 −13 ...n/groovy/org/grails/datastore/mapping/dynamodb/util/DelayAfterWriteDynamoDBTemplateDecorator.java
  62. +12 −5 ...tastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBTemplate.java
  63. +32 −16 ...ore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBTemplateImpl.java
  64. +14 −8 ...s-datastore-dynamodb/src/main/groovy/org/grails/datastore/mapping/dynamodb/util/DynamoDBUtil.java
  65. +6 −8 grails-datastore-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/GemfireDatastore.java
  66. +1 −5 ...e-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/engine/GemfireEntityPersister.java
  67. +15 −20 ...ls-datastore-gemfire/src/main/groovy/org/grails/datastore/mapping/gemfire/query/GemfireQuery.java
  68. +2 −2 ...n/groovy/org/grails/datastore/gorm/dynamodb/bean/factory/DynamoDBMappingContextFactoryBean.groovy
  69. +21 −22 ...ovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBApplicationContextConfigurer.groovy
  70. +9 −10 ...rc/main/groovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBMethodsConfigurer.groovy
  71. +1 −2 ...src/main/groovy/org/grails/datastore/gorm/dynamodb/plugin/support/DynamoDBSpringConfigurer.groovy
  72. +2 −5 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/ChildEntity.groovy
  73. +3 −23 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/CommonTypes.groovy
  74. +3 −8 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Country.groovy
  75. +1 −3 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  76. +6 −5 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/DynamoDBCombinationSpec.groovy
  77. +3 −9 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/GroupWithin.groovy
  78. +1 −2 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/InheritanceSpec.groovy
  79. +35 −35 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/LexComparisonSpec.groovy
  80. +4 −8 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  81. +3 −10 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Person.groovy
  82. +3 −11 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Pet.groovy
  83. +3 −8 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/PlantNumericIdValue.groovy
  84. +3 −9 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/Publication.groovy
  85. +3 −2 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/SimpleDBHiloSpec.groovy
  86. +2 −7 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/TestEntity.groovy
  87. +3 −8 grails-datastore-gorm-dynamodb/src/test/groovy/grails/gorm/tests/UniqueGroup.groovy
  88. +15 −15 grails-datastore-gorm-dynamodb/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  89. +12 −11 ...tastore-gorm-gemfire/src/main/groovy/org/grails/datastore/gorm/gemfire/GemfireGormEnhancer.groovy
  90. +3 −18 grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  91. +4 −8 grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  92. +4 −4 grails-datastore-gorm-gemfire/src/test/groovy/grails/gorm/tests/PropertyComparisonQuerySpec.groovy
  93. +1 −1 ...s-datastore-gorm-gemfire/src/test/groovy/org/grails/datastore/gorm/gemfire/GemfireUuidSpec.groovy
  94. +11 −11 grails-datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/GormToJpaTransform.java
  95. +7 −12 grails-datastore-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/JpaGormEnhancer.groovy
  96. +3 −4 ...orm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/bean/factory/JpaDatastoreFactoryBean.groovy
  97. +6 −8 ...gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/plugin/support/JpaMethodsConfigurer.groovy
  98. +4 −8 ...-gorm-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/plugin/support/JpaSpringConfigurer.groovy
  99. +6 −18 ...m-jpa/src/main/groovy/org/grails/datastore/gorm/jpa/support/JpaPersistenceContextInterceptor.java
  100. +6 −8 grails-datastore-gorm-jpa/src/test/groovy/grails/gorm/tests/Book.groovy
  101. +6 −4 ...s-datastore-gorm-jpa/src/test/groovy/org/grails/datastore/gorm/JpaMappingConfigurationSpec.groovy
  102. +1 −0 ...ls-datastore-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/MongoCriteriaBuilder.java
  103. +1 −2 ...re-gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/bean/factory/GMongoFactoryBean.java
  104. +4 −2 ...rc/main/groovy/org/grails/datastore/gorm/mongo/bean/factory/MongoMappingContextFactoryBean.groovy
  105. +7 −13 ...gorm-mongo/src/main/groovy/org/grails/datastore/gorm/mongo/config/MongoDatastoreConfigurer.groovy
  106. +16 −20 ...ongo/src/main/groovy/org/grails/datastore/gorm/mongo/plugin/support/MongoMethodsConfigurer.groovy
  107. +6 −5 ...mongo/src/main/groovy/org/grails/datastore/gorm/mongo/plugin/support/MongoSpringConfigurer.groovy
  108. +16 −28 ...ls-datastore-gorm-mongo/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy
  109. +14 −16 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  110. +12 −12 ...atastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy
  111. +2 −7 ...-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy
  112. +1 −3 ...tastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy
  113. +7 −6 ...store-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy
  114. +5 −13 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy
  115. +2 −2 ...s-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy
  116. +16 −18 ...go/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy
  117. +5 −9 ...atastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy
  118. +5 −8 ...-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy
  119. +4 −9 ...ls-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy
  120. +0 −5 ...tastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy
  121. +12 −12 ...mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy
  122. +1 −4 ...astore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy
  123. +8 −19 ...test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy
  124. +16 −20 ...m-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy
  125. +5 −10 ...ore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy
  126. +4 −11 ...go/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy
  127. +1 −2 ...ongo/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy
  128. +1 −1 ...ls-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy
  129. +1 −4 ...datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy
  130. +5 −8 ...m-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy
  131. +3 −5 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy
  132. +15 −18 ...datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy
  133. +7 −9 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy
  134. +2 −5 ...tastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy
  135. +3 −6 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy
  136. +6 −8 ...store-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy
  137. +6 −8 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy
  138. +1 −7 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy
  139. +2 −5 ...s-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy
  140. +2 −10 ...re-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy
  141. +4 −15 ...datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy
  142. +3 −6 ...tastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy
  143. +1 −3 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy
  144. +6 −12 ...datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy
  145. +4 −6 grails-datastore-gorm-mongo/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy
  146. +2 −2 .../main/groovy/org/grails/datastore/gorm/plugin/support/AggregatePersistenceContextInterceptor.java
  147. +7 −9 ...rm-plugin-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/OnChangeHandler.groovy
  148. +3 −3 ...m-plugin-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurer.groovy
  149. +9 −8 ...port/src/test/groovy/org/grails/datastore/gorm/plugin/support/DynamicMethodsConfigurerSpec.groovy
  150. +3 −3 ...lugin-support/src/test/groovy/org/grails/datastore/gorm/plugin/support/OnChangeHandlerSpec.groovy
  151. +10 −7 ...ugin-support/src/test/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurerSpec.groovy
  152. +3 −3 grails-datastore-gorm-redis/src/main/groovy/org/grails/datastore/gorm/redis/RedisGormEnhancer.groovy
  153. +1 −1 ...dis/src/main/groovy/org/grails/datastore/gorm/redis/bean/factory/RedisDatastoreFactoryBean.groovy
  154. +1 −1 ...rc/main/groovy/org/grails/datastore/gorm/redis/bean/factory/RedisMappingContextFactoryBean.groovy
  155. +4 −4 grails-datastore-gorm-redis/src/test/groovy/grails/gorm/tests/PropertyComparisonQuerySpec.groovy
  156. +1 −2 ...n/groovy/org/grails/datastore/gorm/simpledb/bean/factory/SimpleDBMappingContextFactoryBean.groovy
  157. +25 −25 ...ovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBApplicationContextConfigurer.groovy
  158. +11 −13 ...rc/main/groovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBMethodsConfigurer.groovy
  159. +2 −3 ...src/main/groovy/org/grails/datastore/gorm/simpledb/plugin/support/SimpleDBSpringConfigurer.groovy
  160. +2 −5 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/ChildEntity.groovy
  161. +2 −22 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/CommonTypes.groovy
  162. +3 −8 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Country.groovy
  163. +3 −9 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/GroupWithin.groovy
  164. +1 −3 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/InheritanceSpec.groovy
  165. +34 −35 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/LexComparisonSpec.groovy
  166. +3 −7 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/PagedResultSpec.groovy
  167. +5 −9 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Person.groovy
  168. +3 −12 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Pet.groovy
  169. +3 −8 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/PlantNumericIdValue.groovy
  170. +3 −9 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/Publication.groovy
  171. +4 −3 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/SimpleDBHiloSpec.groovy
  172. +3 −5 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/StringConversionSpec.groovy
  173. +2 −7 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/TestEntity.groovy
  174. +4 −8 grails-datastore-gorm-simpledb/src/test/groovy/grails/gorm/tests/UniqueGroup.groovy
  175. +14 −14 grails-datastore-gorm-simpledb/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  176. +1 −3 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CriteriaBuilderSpec.groovy
  177. +1 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DeleteAllSpec.groovy
  178. +2 −12 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DetachedCriteriaSpec.groovy
  179. +0 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/EnumSpec.groovy
  180. +227 −231 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/FindByMethodSpec.groovy
  181. +34 −33 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/FirstAndLastMethodSpec.groovy
  182. +1 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/GormEnhancerSpec.groovy
  183. +3 −4 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/GroovyProxySpec.groovy
  184. +1 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/InheritanceSpec.groovy
  185. +2 −10 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/PagedResultSpec.groovy
  186. +1 −2 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/QueryByNullSpec.groovy
  187. +7 −9 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/RangeQuerySpec.groovy
  188. +1 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/SaveAllSpec.groovy
  189. +1 −15 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/SizeQuerySpec.groovy
  190. +1 −1 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/TestEnum.groovy
  191. +6 −11 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/UniqueConstraintSpec.groovy
  192. +4 −4 grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ValidationSpec.groovy
  193. +16 −18 grails-datastore-gorm-test/src/main/groovy/grails/datastore/test/DatastoreUnitTestMixin.groovy
  194. +1 −9 grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy
  195. +45 −79 grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy
  196. +1 −7 ...-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy
  197. +4 −10 ...ore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy
  198. +4 −13 ...-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy
  199. +3 −4 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy
  200. +4 −8 ...store-gorm-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy
  201. +3 −9 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy
  202. +2 −9 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy
  203. +1 −8 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy
  204. +3 −6 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy
  205. +6 −7 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy
  206. +0 −9 ...datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy
  207. +2 −9 ...datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy
  208. +1 −8 ...s-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy
  209. +5 −4 ...ls-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy
  210. +0 −8 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy
  211. +3 −8 ...atastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy
  212. +1 −9 ...store-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy
  213. +12 −12 ...s-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy
  214. +5 −12 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy
  215. +3 −8 ...datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy
  216. +3 −8 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy
  217. +2 −20 ...s-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy
  218. +2 −7 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy
  219. +0 −2 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy
  220. +1 −1 ...-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy
  221. +13 −13 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy
  222. +2 −10 grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy
  223. +5 −11 ...ls-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UniqueConstraintGroupSpec.groovy
  224. +10 −23 grails-datastore-gorm/src/main/groovy/grails/gorm/CriteriaBuilder.java
  225. +48 −53 grails-datastore-gorm/src/main/groovy/grails/gorm/DetachedCriteria.groovy
  226. +8 −10 grails-datastore-gorm/src/main/groovy/grails/gorm/PagedResultList.java
  227. +1 −3 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy
  228. +14 −16 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy
  229. +47 −49 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy
  230. +6 −5 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy
  231. +6 −6 ...m/src/main/groovy/org/grails/datastore/gorm/bean/factory/AbstractMappingContextFactoryBean.groovy
  232. +1 −1 ...tore-gorm/src/main/groovy/org/grails/datastore/gorm/config/GrailsDomainClassPersistentEntity.java
  233. +18 −11 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java
  234. +0 −2 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java
  235. +9 −9 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java
  236. +23 −29 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java
  237. +2 −2 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java
  238. +2 −2 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java
  239. +7 −8 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java
  240. +5 −5 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java
  241. +1 −1 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java
  242. +3 −2 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java
  243. +19 −20 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java
  244. +7 −9 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
  245. +2 −2 grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy
  246. +4 −3 ...-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy
  247. +3 −7 .../src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java
  248. +250 −237 ...e-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java
  249. +49 −54 ...ore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/UniqueConstraint.groovy
  250. +1 −2 grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/JpaDatastore.java
  251. +11 −7 grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/JpaSession.java
  252. +1 −1 ...-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/config/JpaMappingConfigurationStrategy.java
  253. +6 −4 ...ls-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/config/JpaPersistentEntity.java
  254. +11 −15 grails-datastore-jpa/src/main/groovy/org/grails/datastore/mapping/jpa/query/JpaQuery.java
  255. +14 −14 grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/MongoDatastore.java
  256. +22 −14 grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/MongoSession.java
  257. +5 −8 ...ls-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoCollection.java
  258. +39 −26 ...atastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/config/MongoMappingContext.java
  259. +109 −95 ...tastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.java
  260. +42 −43 grails-datastore-mongo/src/main/groovy/org/grails/datastore/mapping/mongo/query/MongoQuery.java
  261. +6 −6 grails-datastore-mongo/src/test/groovy/org/grails/datastore/mapping/mongo/EnumPersistenceSpec.groovy
  262. +5 −24 ...datastore-redis/src/main/java/org/grails/datastore/mapping/redis/engine/RedisEntityPersister.java
  263. +1 −1 ...tore-redis/src/main/java/org/grails/datastore/mapping/redis/engine/RedisPropertyValueIndexer.java
  264. +6 −10 grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/query/RedisQuery.java
  265. +1 −3 grails-datastore-redis/src/main/java/org/grails/datastore/mapping/redis/util/JedisTemplate.java
  266. +1 −1 ...s-datastore-redis/src/test/groovy/org/grails/datastore/mapping/redis/LazyLoadedOneToOneTests.java
  267. +18 −24 ...atastore-redis/src/test/groovy/org/grails/datastore/mapping/redis/collection/RedisMapTests.groovy
  268. +2 −2 grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/SimpleMapDatastore.java
  269. +1 −1 grails-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/SimpleMapSession.java
  270. +9 −11 ...simple/src/main/groovy/org/grails/datastore/mapping/simple/engine/SimpleMapEntityPersister.groovy
  271. +25 −28 ...-datastore-simple/src/main/groovy/org/grails/datastore/mapping/simple/query/SimpleMapQuery.groovy
  272. +0 −1 ...store-simple/src/main/groovy/org/grails/datastore/mapping/simple/query/SimpleMapResultList.groovy
  273. +3 −2 ...impledb/src/main/groovy/org/grails/datastore/mapping/simpledb/DelayAfterWriteSimpleDBSession.java
  274. +16 −10 ...s-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/SimpleDBDatastore.java
  275. +3 −2 grails-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/SimpleDBSession.java
  276. +1 −1 ...ledb/src/main/groovy/org/grails/datastore/mapping/simpledb/config/GormSimpleDBMappingFactory.java
  277. +2 −1 ...simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/config/SimpleDBMappingContext.java
  278. +1 −1 .../src/main/groovy/org/grails/datastore/mapping/simpledb/engine/AbstractSimpleDBDomainResolver.java
  279. +1 −2 ...ledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBAssociationIndexer.java
  280. +0 −1 ...impledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBEntityPersister.java
  281. +7 −7 ...impledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBHiLoIdGenerator.java
  282. +8 −7 ...ledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBIdGeneratorFactory.java
  283. +0 −1 ...ore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/engine/SimpleDBNativeItem.java
  284. +0 −1 ...main/groovy/org/grails/datastore/mapping/simpledb/model/types/SimpleDBTypeConverterRegistrar.java
  285. +17 −14 ...datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/query/SimpleDBQuery.java
  286. +6 −5 ...n/groovy/org/grails/datastore/mapping/simpledb/util/DelayAfterWriteSimpleDBTemplateDecorator.java
  287. +15 −3 ...ore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/util/SimpleDBTemplateImpl.java
  288. +5 −5 ...s-datastore-simpledb/src/main/groovy/org/grails/datastore/mapping/simpledb/util/SimpleDBUtil.java
  289. +0 −4 grails-plugins/mongodb/application.properties
  290. +1 −4 grails-plugins/redis/application.properties
@@ -29,7 +29,7 @@
* @param entityJavaClass equivalent to {@link PersistentEntity.getJavaClass()}
* @param cacheAdapter
*/
- void setTPCacheAdapter(Class entityJavaClass, TPCacheAdapter<T> cacheAdapter);
+ void setTPCacheAdapter(@SuppressWarnings("rawtypes") Class entityJavaClass, TPCacheAdapter<T> cacheAdapter);
/**
* Sets {@link TPCacheAdapter} for the specified FQN java class of {@link PersistentEntity}.
@@ -5,6 +5,8 @@
* @author Roman Stepanenko
*/
public class CacheException extends RuntimeException{
+ private static final long serialVersionUID = 1;
+
public CacheException() {
}
@@ -24,7 +24,7 @@ public void setTPCacheAdapter(PersistentEntity entity, TPCacheAdapter<T> cacheAd
setTPCacheAdapter(entity.getJavaClass(), cacheAdapter);
}
- public void setTPCacheAdapter(Class entityJavaClass, TPCacheAdapter<T> cacheAdapter) {
+ public void setTPCacheAdapter(@SuppressWarnings("rawtypes") Class entityJavaClass, TPCacheAdapter<T> cacheAdapter) {
setTPCacheAdapter(entityJavaClass.getName(), cacheAdapter);
}
@@ -34,7 +34,6 @@
private final List list;
-
public PersistentList(Class childType, Session session, List collection) {
super(childType, session, collection);
this.list = collection;
@@ -12,7 +12,7 @@
* @author Graeme Rocher
* @since 1.0
*/
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({ "rawtypes", "unchecked" })
public class PersistentSortedSet extends AbstractPersistentCollection implements SortedSet {
public PersistentSortedSet(Class childType, Session session, SortedSet collection) {
@@ -27,7 +27,6 @@ public PersistentSortedSet(Serializable associationKey, Session session, Associa
super(associationKey, session, indexer, new TreeSet());
}
- @Override
public Comparator comparator() {
return getSortedSet().comparator();
}
@@ -37,27 +36,22 @@ private SortedSet getSortedSet() {
return ((SortedSet)collection);
}
- @Override
public SortedSet subSet(Object o, Object o1) {
return getSortedSet().subSet(o,o1);
}
- @Override
public SortedSet headSet(Object o) {
return getSortedSet().headSet(o);
}
- @Override
public SortedSet tailSet(Object o) {
return getSortedSet().tailSet(o);
}
- @Override
public Object first() {
return getSortedSet().first();
}
- @Override
public Object last() {
return getSortedSet().last();
}
@@ -20,30 +20,34 @@
import java.util.HashMap;
import java.util.Map;
-import org.grails.datastore.mapping.model.*;
-import org.springframework.beans.BeanUtils;
import org.grails.datastore.mapping.config.groovy.MappingConfigurationBuilder;
+import org.grails.datastore.mapping.model.ClassMapping;
+import org.grails.datastore.mapping.model.IdentityMapping;
+import org.grails.datastore.mapping.model.MappingFactory;
+import org.grails.datastore.mapping.model.PersistentEntity;
+import org.grails.datastore.mapping.model.PersistentProperty;
import org.grails.datastore.mapping.model.config.GormProperties;
import org.grails.datastore.mapping.reflect.ClassPropertyFetcher;
+import org.springframework.beans.BeanUtils;
/**
* Abstract GORM implementation that uses the GORM MappingConfigurationBuilder to configure entity mappings.
*
* @author Graeme Rocher
*/
+@SuppressWarnings({"rawtypes", "unchecked"})
public abstract class AbstractGormMappingFactory<R, T> extends MappingFactory<R, T> {
protected Map<PersistentEntity, Map<String, T>> entityToPropertyMap = new HashMap<PersistentEntity, Map<String, T>>();
private Closure defaultMapping;
- @SuppressWarnings("unchecked")
@Override
public R createMappedForm(PersistentEntity entity) {
ClassPropertyFetcher cpf = ClassPropertyFetcher.forClass(entity.getJavaClass());
R family = BeanUtils.instantiate(getEntityMappedFormType());
MappingConfigurationBuilder builder = new MappingConfigurationBuilder(family, getPropertyMappedFormType());
- if(defaultMapping != null) {
+ if (defaultMapping != null) {
builder.evaluate(defaultMapping);
}
Closure value = cpf.getStaticPropertyValue(GormProperties.MAPPING, Closure.class);
@@ -58,7 +62,6 @@ public R createMappedForm(PersistentEntity entity) {
return family;
}
-
public void setDefaultMapping(Closure defaultMapping) {
this.defaultMapping = defaultMapping;
}
@@ -70,10 +73,10 @@ public void setDefaultMapping(Closure defaultMapping) {
@Override
public IdentityMapping createIdentityMapping(ClassMapping classMapping) {
Map<String, T> props = entityToPropertyMap.get(classMapping.getEntity());
- if(props != null) {
+ if (props != null) {
T property = props.get(IDENTITY_PROPERTY);
IdentityMapping customIdentityMapping = getIdentityMappedForm(classMapping,property);
- if(customIdentityMapping != null) {
+ if (customIdentityMapping != null) {
return customIdentityMapping;
}
}
@@ -85,20 +88,20 @@ protected IdentityMapping getIdentityMappedForm(ClassMapping classMapping, T pro
}
@Override
- public T createMappedForm(@SuppressWarnings("rawtypes") PersistentProperty mpp) {
+ public T createMappedForm(PersistentProperty mpp) {
Map<String, T> properties = entityToPropertyMap.get(mpp.getOwner());
if (properties != null && properties.containsKey(mpp.getName())) {
return properties.get(mpp.getName());
}
- else if(properties != null) {
+ else if (properties != null) {
Property property = (Property) properties.get(IDENTITY_PROPERTY);
- if(property != null && mpp.getName().equals(property.getName())) {
+ if (property != null && mpp.getName().equals(property.getName())) {
return (T) property;
}
}
T defaultMapping = properties != null ? properties.get("*") : null;
- if(defaultMapping != null) {
+ if (defaultMapping != null) {
try {
return (T)((Property)defaultMapping).clone();
} catch (CloneNotSupportedException e) {
@@ -14,8 +14,8 @@
*/
package org.grails.datastore.mapping.config.groovy
-import org.springframework.beans.MutablePropertyValues
import org.grails.datastore.mapping.reflect.NameUtils
+import org.springframework.beans.MutablePropertyValues
import org.springframework.validation.DataBinder
/**
@@ -46,8 +46,6 @@ class MappingConfigurationBuilder {
return
}
-
-
def setterName = NameUtils.getSetterName(name)
if (target.respondsTo(setterName)) {
target[name] = args.size() == 1 ? args[0] : args
@@ -56,7 +54,7 @@ class MappingConfigurationBuilder {
if (args[0] instanceof Map) {
def instance
- if(properties['*']) {
+ if (properties['*']) {
instance = properties['*'].clone()
}
else {
@@ -70,7 +70,6 @@ public AbstractDatastore(MappingContext mappingContext, Map<String, String> conn
this.cacheAdapterRepository = cacheAdapterRepository;
}
- @Override
public void destroy() throws Exception {
ERRORS_MAP.remove();
VALIDATE_MAP.remove();
@@ -105,7 +104,7 @@ public final Session connect(Map<String, String> connDetails) {
* @param connectionDetails The session details
* @return The session object
*/
- protected abstract Session createSession(@SuppressWarnings("hiding") Map<String, String> connectionDetails);
+ protected abstract Session createSession(Map<String, String> connectionDetails);
public Session getCurrentSession() throws ConnectionNotFoundException {
return DatastoreUtils.doGetSession(this, false);
@@ -188,7 +187,7 @@ public boolean skipValidation(final Object o) {
return VALIDATE_MAP.get();
}
- protected void initializeConverters(@SuppressWarnings("hiding") MappingContext mappingContext) {
+ protected void initializeConverters(MappingContext mappingContext) {
final ConverterRegistry conversionService = mappingContext.getConverterRegistry();
BasicTypeConverterRegistrar registrar = new BasicTypeConverterRegistrar();
registrar.register(conversionService);
@@ -28,12 +28,6 @@
import javax.persistence.FlushModeType;
import org.grails.datastore.mapping.cache.TPCacheAdapterRepository;
-import org.grails.datastore.mapping.query.api.QueryableCriteria;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
import org.grails.datastore.mapping.collection.PersistentCollection;
import org.grails.datastore.mapping.core.impl.PendingInsert;
import org.grails.datastore.mapping.core.impl.PendingOperation;
@@ -46,7 +40,13 @@
import org.grails.datastore.mapping.model.MappingContext;
import org.grails.datastore.mapping.model.PersistentEntity;
import org.grails.datastore.mapping.query.Query;
+import org.grails.datastore.mapping.query.api.QueryableCriteria;
import org.grails.datastore.mapping.transactions.Transaction;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.InvalidDataAccessResourceUsageException;
import org.springframework.transaction.NoTransactionException;
import org.springframework.util.Assert;
@@ -172,8 +172,7 @@ public void cacheEntry(PersistentEntity entity, Serializable key, Object entry)
cacheEntry(key, entry, getEntryCache(entity.getJavaClass(), false), false);
}
- protected void cacheEntry(Serializable key, Object entry, Map<Serializable, Object> entryCache,
- @SuppressWarnings("unused") boolean forDirtyCheck) {
+ protected void cacheEntry(Serializable key, Object entry, Map<Serializable, Object> entryCache, boolean forDirtyCheck) {
entryCache.put(key, entry);
}
@@ -333,7 +332,7 @@ private boolean hasUpdates() {
return !pendingInserts.isEmpty() || !pendingUpdates.isEmpty() || !pendingDeletes.isEmpty();
}
- protected void postFlush(@SuppressWarnings("unused") boolean hasUpdates) {
+ protected void postFlush(boolean hasUpdates) {
// do nothing
}
@@ -391,7 +390,6 @@ else if (o instanceof PersistentEntity) {
return p;
}
- @SuppressWarnings("hiding")
protected abstract Persister createPersister(Class cls, MappingContext mappingContext);
public boolean contains(Object o) {
@@ -37,6 +37,7 @@
* @author Juergen Hoeller
* @author Graeme Rocher
*/
+@SuppressWarnings("rawtypes")
public abstract class DatastoreUtils {
public static final Log logger = LogFactory.getLog(DatastoreUtils.class);
@@ -15,13 +15,15 @@
package org.grails.datastore.mapping.core;
/**
- * Exception thrown when an identity cannot be generated
+ * Thrown when an identity cannot be generated.
*
* @author Graeme Rocher
* @since 1.0
*/
public class IdentityGenerationException extends RuntimeException {
+ private static final long serialVersionUID = 1;
+
public IdentityGenerationException(String msg) {
super(msg);
}
@@ -15,7 +15,12 @@
package org.grails.datastore.mapping.document.config;
-import org.grails.datastore.mapping.model.*;
+import org.grails.datastore.mapping.model.AbstractClassMapping;
+import org.grails.datastore.mapping.model.AbstractPersistentEntity;
+import org.grails.datastore.mapping.model.ClassMapping;
+import org.grails.datastore.mapping.model.IdentityMapping;
+import org.grails.datastore.mapping.model.MappingContext;
+import org.grails.datastore.mapping.model.PersistentEntity;
public class DocumentPersistentEntity extends AbstractPersistentEntity<Collection> {
@@ -47,7 +52,7 @@ public Collection getMappedForm() {
@Override
public IdentityMapping getIdentifier() {
- if(identityMapping == null) {
+ if (identityMapping == null) {
identityMapping = context.getMappingFactory().createIdentityMapping(this);
}
return identityMapping;
Oops, something went wrong.

0 comments on commit 54dffdf

Please sign in to comment.