core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java (31 lines):
	- line 113: * TODO most of the non persister code SIC comes from {@link org.hibernate.persister.entity.UnionSubclassEntityPersister}
	- line 144: // TODO increase visibility in superclass?
	- line 256: // TODO batch logic copied from AbstractEntityPersister
	- line 265: //TODO: i'm not sure, but perhaps we should exclude
	- line 498: // TODO: For now I'm adding all *-to-one columns to the projection list; Actually we need to ask the
	- line 706: //FIXME cache should use Core Types or Grid Types?
	- line 770: * TODO should we use cache.replace() it seems more expensive to pass the resultset around "just" the atomicity of the operation
	- line 787: //TODO move that code to the EntityLoader as it is in AbstractEntityPersister?
	- line 870: //TODO: inexact, what we really need to know is: are any outer joins used?
	- line 924: // TODO copied from AbtractEntityPersister: change the visibility
	- line 964: //FIXME add support to lock mode and loadQueryInfluencers
	- line 973: //FIXME add support to lock mode and loadQueryInfluencers
	- line 983: //TODO verify what to do with #check: Expectation seems to be very JDBC centric
	- line 1074: //FIXME We don't handle deferred property yet
	- line 1082: //TODO What to do?
	- line 1097: //TODO do something about suffixes
	- line 1141: //TODO support "multi table" entities
	- line 1162: //TODO does that apply to OGM?
	- line 1178: //TODO handle lazy
	- line 1209: boolean[] versionability = getPropertyVersionability(); //TODO: is this really necessary????
	- line 1214: //TODO do a diff on the properties value from resultset and the dirty value
	- line 1220: versionability[i]; //TODO: is this really necessary????
	- line 1223: //FIXME what do do with settable?
	- line 1248: // TODO OGM-616 Also use this facet for "all columns" optimistic locking strategy
	- line 1413: // TODO: Atm. the table span is always 1, i.e. mappings to several tables (@SecondaryTable) are not supported
	- line 1640: //TODO do a diff on the properties value from resultset
	- line 1650: //TODO support other entity modes
	- line 1760: //TODO support filter in OGM??? How???
	- line 1789: //FIXME useful?
	- line 1797: //TODO: check this....
	- line 1803: //FIXME it should be the subquery ie include the subclasses as well in SQL (union logic)


core/src/main/java/org/hibernate/ogm/loader/impl/OgmLoader.java (23 lines):
	- line 277: //TODO handles the read only
	- line 319: //TODO support lock timeout
	- line 323: //TODO yuk! Is there a cleaner way to access the id?
	- line 354: //FIXME should we use subselects as it's closer to this process??
	- line 356: //TODO is resultset a good marker, or should it be an ad-hoc marker??
	- line 363: //TODO should we collect List<Object> as result? Not necessary today
	- line 386: //TODO collect subselect result key
	- line 395: //TODO create subselects
	- line 413: // TODO: only call this hydration phase if we know that the collection contains directly or indirectly ToOnes
	- line 531: //TODO Implement all Loader#extractKeysFromResultSet (ie resolution in case of composite ids with associations)
	- line 553: //TODO this if won't work when we will support collections inside the entity tuple but that will do for now
	- line 622: //TODO investigate further the result transformer application
	- line 629: //TODO: make this handle multiple collection roles!
	- line 655: //TODO: old version did not require hashmap lookup:
	- line 664: resultSet, //TODO CURRENT must use the same instance across all calls
	- line 718: //TODO: This is assertion is disabled because there is a bug that means the
	- line 784: //TODO: or we could do this polymorphically, and have two
	- line 818: //TODO: or we could do this polymorphically, and have two
	- line 873: //FIXME fix the alias issue: could be that the "default" lock mode in LockOptions does that already
	- line 987: //TODO create an interface for this usage
	- line 1133: //FIXME figure out what that means and what value should be set
	- line 1148: //TODO what to do with that in OGM
	- line 1250: //TODO: can we *always* use the "null property" approach for everything?


core/src/main/java/org/hibernate/ogm/hibernatecore/impl/OgmSessionImpl.java (6 lines):
	- line 81: //TODO plug the Lucene engine
	- line 87: //TODO plug the Lucene engine
	- line 93: //TODO plug the Lucene engine
	- line 99: //TODO plug the Lucene engine
	- line 105: //TODO plug the Lucene engine
	- line 111: //TODO plug the Lucene engine


core/src/main/java/org/hibernate/ogm/persister/impl/OgmCollectionPersister.java (6 lines):
	- line 269: // TODO pass constructor
	- line 296: // TODO always false: OGM does not assume cascade delete is supported by the underlying engine
	- line 342: // FIXME update the associated entity key data
	- line 562: // TODO: copy/paste from recreate()
	- line 600: // TODO: copy/paste from insertRows()
	- line 669: // TODO what happens when a row should be *updated* ?: I suspect ADD works OK as it's a put()


core/src/main/java/org/hibernate/ogm/loader/entity/impl/OgmBatchableEntityLoaderBuilder.java (4 lines):
	- line 25: // TODO handle LoadQueryInfluenbcers to handle entityGraph
	- line 33: // TODO handle LoadQueryInfluenbcers to handle entityGraph
	- line 41: // TODO handle LoadQueryInfluenbcers to handle entityGraph
	- line 49: // TODO handle LoadQueryInfluenbcers to handle entityGraph


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/ProtofieldAccessorSet.java (4 lines):
	- line 88: //TODO same as CalendarDateType ?
	- line 98: //TODO same as DateType?
	- line 105: //TODO same as PrimitiveByteArrayType?
	- line 157: /* FIXME Alternative: Support of native Enum mapping in protobuf:


infinispan-embedded/src/main/java/org/hibernate/ogm/datastore/infinispan/InfinispanDialect.java (3 lines):
	- line 105: // TODO find a more efficient pessimistic read
	- line 142: //TODO we don't verify that it does not yet exist assuming that this has been done before by the calling code
	- line 176: //TODO we don't verify that it does not yet exist assuming that this has been done before by the calling code


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/MongoDBDialect.java (3 lines):
	- line 512: //TODO deal with dotted column names once this method is used for ALL / Dirty optimistic locking
	- line 930: if ( !queryParameters.getPositionalParameters().isEmpty() ) { // TODO Implement binding positional parameters.
	- line 978: if ( !queryParameters.getPositionalParameters().isEmpty() ) { // TODO Implement binding positional parameters.


core/src/main/java/org/hibernate/ogm/loader/entity/impl/BatchingEntityLoaderBuilder.java (2 lines):
	- line 30: // FIXME: Transform this method into a service initiator and have BatchingEntityLoader be a Service when migrating back to ORM
	- line 34: // TODO should we raise an info on ignoring this setting


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/query/parsing/nativequery/impl/NativeQueryParser.java (2 lines):
	- line 92: //TODO OGM-949 it should not be just ANY matcher as they are some restrictions in the Collection naming in Mongo
	- line 115: // TODO There are many more query types than what we support.


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/InfinispanRemoteDialect.java (2 lines):
	- line 491: //TODO Not implemented yet as Hot Rod's support for atomic operations is complex, so default to the naive impl;
	- line 528: //TODO getAll doesn't support versioned entries ?!


core/src/main/java/org/hibernate/ogm/compensation/impl/InvocationCollectingGridDialect.java (2 lines):
	- line 101: // TODO OGM-766 Avoid the looping + re-creation
	- line 139: // TODO OGM-766 Avoid the looping + re-creation


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/CalendarDateProtofieldAccessor.java (1 line):
	- line 20: //TODO should we map this as a composite object, to encode both the utcTimestamp and the timezone?


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/index/impl/MongoDBIndexSpec.java (1 line):
	- line 91: // TODO OGM-1080: the columnOrderMap is not accessible for an Index


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/query/parsing/impl/MongoDBQueryParsingResult.java (1 line):
	- line 84: //TODO Non-scalar case


core/src/main/java/org/hibernate/ogm/hibernatecore/impl/BackendCustomLoader.java (1 line):
	- line 124: // TODO OGM-564 As a temporary work-around, retrieving the names from the actual result in case there


core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveAssociation.java (1 line):
	- line 18: // TODO OGM-777 Expose previous state?


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/dialect/impl/MongoHelpers.java (1 line):
	- line 70: //TODO clean up the hierarchy of empty containers


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/schema/SanitationUtils.java (1 line):
	- line 13: return name.replace( '.', '_' );//TODO verify against introducing ambiguities


core/src/main/java/org/hibernate/ogm/dialect/impl/GridDialectInitiator.java (1 line):
	- line 81: // FIXME not sure I like this constructor business. Argue with Sanne


core/src/main/java/org/hibernate/ogm/massindex/impl/TupleIndexer.java (1 line):
	- line 106: // FIXME for improved performance: avoid loading them in an early phase.


core/src/main/java/org/hibernate/ogm/query/spi/QueryParserService.java (1 line):
	- line 46: // TODO: Should SF be injected during construction?


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/TypeDeclarationsCollector.java (1 line):
	- line 27: //TODO clarify this message or deal with it


core/src/main/java/org/hibernate/ogm/query/spi/QueryParsingResult.java (1 line):
	- line 36: // TODO Only used for pure projection atm. To be replaced with something which works for mixing returns of different


core/src/main/java/org/hibernate/ogm/datastore/document/impl/DotPatternMapHelpers.java (1 line):
	- line 50: //TODO clean up the hierarchy of empty containers


mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/dialect/impl/MongoDBAssociationSnapshot.java (1 line):
	- line 138: // TODO This only is used for tests; Can we get rid of it?


core/src/main/java/org/hibernate/ogm/type/impl/ByteStringType.java (1 line):
	- line 16: * TODO Could be better to persist as an {@link Integer}.


core/src/main/java/org/hibernate/ogm/loader/entity/impl/BatchableEntityLoader.java (1 line):
	- line 20: * TODO: move that method to UniqueEntityLoader


core/src/main/java/org/hibernate/ogm/massindex/impl/OptionallyWrapInJTATransaction.java (1 line):
	- line 53: // TODO get SessionFactoryImplementor it from the SearchFactory as we might get a hold of the SFI at startup


core/src/main/java/org/hibernate/ogm/loader/impl/TupleBasedEntityLoader.java (1 line):
	- line 18: * TODO: This is used for the mass indexer and also to convert query results (tuple collections) into objects. At least


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/InfinispanRemoteStoredProceduresManager.java (1 line):
	- line 35: // TODO: switch to error code based pattern when Infinispan provides such opportunity.


core/src/main/java/org/hibernate/ogm/type/impl/ComponentType.java (1 line):
	- line 57: //TODO in the original componentType begin and loc are different (namely begin only counts settable slots


infinispan-embedded/src/main/java/org/hibernate/ogm/datastore/infinispan/dialect/impl/InfinispanPessimisticWriteLockingStrategy.java (1 line):
	- line 68: //FIXME check the version number as well and raise an optimistic lock exception if there is an issue JPA 2 spec: 3.4.4.2


neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/BaseNeo4jDialect.java (1 line):
	- line 225: // TODO implement. org.hibernate.ogm.datastore.mongodb.MongoDBDialect.executeBackendUpdateQuery(BackendQuery<MongoDBQueryDescriptor>, QueryParameters) might be helpful as a reference.


core/src/main/java/org/hibernate/ogm/dialect/impl/BatchOperationsDelegator.java (1 line):
	- line 83: // TODO: Ideally, we should log the entity name + id here; For now we trust the datastore to provide this


core/src/main/java/org/hibernate/ogm/type/impl/EnumType.java (1 line):
	- line 27: //TODO It would probably be better to implement all of this as a subclass of BasicGridType


neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/EmbeddedNeo4jDialect.java (1 line):
	- line 387: // TODO replace with method provided by OGM-1035


core/src/main/java/org/hibernate/ogm/datastore/map/impl/MapPessimisticWriteLockingStrategy.java (1 line):
	- line 58: // FIXME check the version number as well and raise an optimistic lock exception if there is an issue JPA 2 spec: 3.4.4.2


neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/embedded/dialect/impl/EmbeddedNeo4jTupleSnapshot.java (1 line):
	- line 83: // TODO: We should create a query to read this value


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/InfinispanRemoteDatastoreProvider.java (1 line):
	- line 135: // TODO temporary create another cache manager to handle remote script registration and invocation due to incompatibility of ProtoStreamMarshaller.


infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/ProtobufSchemaInitializer.java (1 line):
	- line 128: //TODO something interesting to do here?


core/src/main/java/org/hibernate/ogm/type/impl/TypeTranslatorImpl.java (1 line):
	- line 94: //TODO should we cache results? It seems an actual HashMap might be slower but it makes it more robust


core/src/main/java/org/hibernate/ogm/type/impl/WrapperBinaryType.java (1 line):
	- line 39: //TODO find a decent name before documenting


core/src/main/java/org/hibernate/ogm/compensation/operation/RemoveTuple.java (1 line):
	- line 18: // TODO OGM-777 Expose previous state?