diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java
index 6fef24e04..f74e33e6e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MappingMongoEntityInformation.java
@@ -46,6 +46,7 @@ public class MappingMongoEntityInformation<T, ID extends Serializable> extends A
   /* (non-Javadoc)
    * @see org.springframework.data.repository.support.EntityInformation#getId(java.lang.Object)
    */
+  @SuppressWarnings("unchecked")
   public ID getId(T entity) {
 
     PersistentProperty idProperty = entityMetadata.getIdProperty();
@@ -60,6 +61,7 @@ public class MappingMongoEntityInformation<T, ID extends Serializable> extends A
   /* (non-Javadoc)
    * @see org.springframework.data.repository.support.EntityInformation#getIdType()
    */
+  @SuppressWarnings("unchecked")
   public Class<ID> getIdType() {
     return (Class<ID>) entityMetadata.getIdProperty().getType();
   }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java
index 9becbe039..5939e8e9e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryMethod.java
@@ -39,7 +39,6 @@ class MongoQueryMethod extends QueryMethod {
    * 
    * @param method
    */
-  @SuppressWarnings({ "rawtypes", "unchecked" })
   public MongoQueryMethod(Method method, EntityInformationCreator entityInformationCreator) {
     super(method);
     this.method = method;