Suppress rawtypes warning

Author: rainboyan

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractMappingContext.java

@@ -234,7 +234,6 @@ public void addTypeConverter(Converter converter) {
     @Override
     public Validator getEntityValidator(PersistentEntity entity) {
         if (entity != null) {
-
             Validator validator = this.entityValidators.get(entity);
             if (validator == null && this.validatorRegistry != null) {
                 Validator v = this.validatorRegistry.getValidator(entity);
@@ -268,7 +267,7 @@ public void addEntityValidator(PersistentEntity entity, Validator validator) {
      * @return The PersistentEntity instance
      */
     @Override
-    public PersistentEntity addExternalPersistentEntity(Class javaClass) {
+    public PersistentEntity addExternalPersistentEntity(Class<?> javaClass) {
         Assert.notNull(javaClass, "PersistentEntity class cannot be null");
 
         PersistentEntity entity = this.persistentEntitiesByName.get(javaClass.getName());
@@ -288,7 +287,7 @@ public PersistentEntity addExternalPersistentEntity(Class javaClass) {
      * @return The PersistentEntity instance
      */
     @Override
-    public PersistentEntity addPersistentEntity(Class javaClass, boolean override) {
+    public PersistentEntity addPersistentEntity(Class<?> javaClass, boolean override) {
         Assert.notNull(javaClass, "PersistentEntity class cannot be null");
         if (override) {
             return addPersistentEntityInternal(javaClass, false, this.canInitializeEntities);
@@ -297,7 +296,7 @@ public PersistentEntity addPersistentEntity(Class javaClass, boolean override) {
     }
 
     @Override
-    public Collection<PersistentEntity> addPersistentEntities(Class... javaClasses) {
+    public Collection<PersistentEntity> addPersistentEntities(Class<?>... javaClasses) {
         Collection<PersistentEntity> entities = new ArrayList<>();
 
         for (Class javaClass : javaClasses) {
@@ -308,18 +307,20 @@ public Collection<PersistentEntity> addPersistentEntities(Class... javaClasses)
 
             registerEntityWithContext(entity);
             entities.add(entity);
-
         }
+
         if (this.canInitializeEntities) {
             for (PersistentEntity entity : entities) {
                 initializePersistentEntity(entity);
             }
         }
+
         for (Listener eventListener : this.eventListeners) {
             for (PersistentEntity entity : entities) {
                 eventListener.persistentEntityAdded(entity);
             }
         }
+
         return entities;
     }
 
@@ -365,7 +366,6 @@ private void registerEntityWithContext(PersistentEntity entity) {
         this.persistentEntities.remove(entity);
         this.persistentEntities.add(entity);
         this.persistentEntitiesByName.put(entity.getName(), entity);
-
     }
 
     @Override
@@ -417,7 +417,6 @@ private void initializePersistentEntity(PersistentEntity entity) {
                 parent = parent.getParentEntity();
             }
         }
-
     }
 
     /**
@@ -516,9 +515,8 @@ public Collection<PersistentEntity> getPersistentEntities() {
         return this.persistentEntities;
     }
 
-    public boolean isPersistentEntity(Class type) {
+    public boolean isPersistentEntity(Class<?> type) {
         return type != null && getPersistentEntity(type.getName()) != null;
-
     }
 
     @Override

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java

@@ -53,7 +53,7 @@
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class AbstractPersistentEntity<T extends Entity> implements PersistentEntity {
 
-    protected final Class javaClass;
+    protected final Class<?> javaClass;
 
     protected final MappingContext context;
 
@@ -63,9 +63,9 @@ public abstract class AbstractPersistentEntity<T extends Entity> implements Pers
 
     protected List<Embedded> embedded;
 
-    protected Map<String, PersistentProperty> propertiesByName = new HashMap<String, PersistentProperty>();
+    protected Map<String, PersistentProperty> propertiesByName = new HashMap<>();
 
-    protected Map<String, PersistentProperty> mappedPropertiesByName = new HashMap<String, PersistentProperty>();
+    protected Map<String, PersistentProperty> mappedPropertiesByName = new HashMap<>();
 
     protected PersistentProperty identity;
 
@@ -101,7 +101,7 @@ public abstract class AbstractPersistentEntity<T extends Entity> implements Pers
 
     private TenantId tenantId;
 
-    public AbstractPersistentEntity(Class javaClass, MappingContext context) {
+    public AbstractPersistentEntity(Class<?> javaClass, MappingContext context) {
         Assert.notNull(javaClass, "The argument [javaClass] cannot be null");
         this.javaClass = javaClass;
         this.context = context;
@@ -178,7 +178,6 @@ public void initialize() {
             this.associations = new ArrayList();
             this.embedded = new ArrayList();
 
-
             boolean multiTenancyEnabled = this.isMultiTenant &&
                     this.context.getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR;
             for (PersistentProperty persistentProperty : this.persistentProperties) {
@@ -420,7 +419,7 @@ public boolean isVersioned() {
     }
 
     @Override
-    public Class getJavaClass() {
+    public Class<?> getJavaClass() {
         return this.javaClass;
     }
 
@@ -477,7 +476,7 @@ public String toString() {
     }
 
     @Override
-    public boolean addOwner(Class type) {
+    public boolean addOwner(Class<?> type) {
         return this.owners.add(type);
     }
 

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentProperty.java

@@ -28,7 +28,6 @@
  * @author Graeme Rocher
  * @since 1.0
  */
-@SuppressWarnings("rawtypes")
 public abstract class AbstractPersistentProperty<T extends Property> implements PersistentProperty<T> {
 
     protected final PersistentEntity owner;
@@ -37,7 +36,7 @@ public abstract class AbstractPersistentProperty<T extends Property> implements
 
     protected final String name;
 
-    protected final Class type;
+    protected final Class<?> type;
 
     protected Boolean inherited;
 
@@ -49,7 +48,7 @@ public AbstractPersistentProperty(PersistentEntity owner, MappingContext context
         this(owner, context, descriptor.getName(), descriptor.getPropertyType());
     }
 
-    public AbstractPersistentProperty(PersistentEntity owner, MappingContext context, String name, Class type) {
+    public AbstractPersistentProperty(PersistentEntity owner, MappingContext context, String name, Class<?> type) {
         this.owner = owner;
         this.context = context;
         this.name = name;
@@ -67,7 +66,7 @@ public String getCapitilizedName() {
     }
 
     @Override
-    public Class getType() {
+    public Class<?> getType() {
         return this.type;
     }
 

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/IdentityMapping.java

@@ -19,13 +19,12 @@
  * @author Graeme Rocher
  * @since 1.0
  */
-@SuppressWarnings("rawtypes")
 public interface IdentityMapping extends PropertyMapping {
 
     /**
      * The identifier property name(s). Usually there is just one identifier
      * name, however in the case of a composite or natural identifier there
-     * may be serveral.
+     * may be several.
      *
      * @return identifier names that make up the key
      */

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/MappingContext.java

@@ -107,15 +107,15 @@ public interface MappingContext {
      * @param javaClasses The Java class representing the entity
      * @return The PersistentEntity instance
      */
-    Collection<PersistentEntity> addPersistentEntities(Class... javaClasses);
+    Collection<PersistentEntity> addPersistentEntities(Class<?>... javaClasses);
 
     /**
      * Adds a PersistentEntity instance
      *
      * @param javaClass The Java class representing the entity
      * @return The PersistentEntity instance
      */
-    PersistentEntity addPersistentEntity(Class javaClass);
+    PersistentEntity addPersistentEntity(Class<?> javaClass);
 
     /**
      * Adds a PersistentEntity instance
@@ -124,7 +124,7 @@ public interface MappingContext {
      * @param override  Whether to override an existing entity
      * @return The PersistentEntity instance
      */
-    PersistentEntity addPersistentEntity(Class javaClass, boolean override);
+    PersistentEntity addPersistentEntity(Class<?> javaClass, boolean override);
 
     /**
      * Adds a persistent entity that is not mapped by this MappingContext instance.
@@ -133,7 +133,7 @@ public interface MappingContext {
      * @param javaClass The Java class
      * @return The persistent entity
      */
-    PersistentEntity addExternalPersistentEntity(Class javaClass);
+    PersistentEntity addExternalPersistentEntity(Class<?> javaClass);
 
     /**
      * Adds a validator to be used by the entity for validation
@@ -205,7 +205,7 @@ public interface MappingContext {
      * @param type The type to check
      * @return True if it is
      */
-    boolean isPersistentEntity(Class type);
+    boolean isPersistentEntity(Class<?> type);
 
     /**
      * Returns whether the specified value is a persistent entity
@@ -243,7 +243,7 @@ public interface MappingContext {
      */
     void addMappingContextListener(Listener listener);
 
-    PersistentEntity createEmbeddedEntity(Class type);
+    PersistentEntity createEmbeddedEntity(Class<?> type);
 
     /**
      * Obtains a {@link EntityReflector} instance for the given entity

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentEntity.java

@@ -125,7 +125,7 @@ public interface PersistentEntity extends Initializable {
     /**
      * @return The underlying Java class for this entity
      */
-    Class getJavaClass();
+    Class<?> getJavaClass();
 
     /**
      * Tests whether the given instance is an instance of this persistent entity
@@ -213,7 +213,7 @@ public interface PersistentEntity extends Initializable {
      * @param type The type
      * @return True if it does
      */
-    boolean hasProperty(String name, Class type);
+    boolean hasProperty(String name, Class<?> type);
 
     /**
      * True if the given property is the identifier
@@ -234,6 +234,6 @@ public interface PersistentEntity extends Initializable {
      * @param type The class to add
      * @return True if the operation was successful
      */
-    boolean addOwner(Class type);
+    boolean addOwner(Class<?> type);
 
 }

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PropertyMapping.java

@@ -30,7 +30,6 @@ public interface PropertyMapping<T extends Property> {
      *
      * @return The ClassMapping instance
      */
-    @SuppressWarnings("rawtypes")
     ClassMapping getClassMapping();
 
     /**

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/types/Association.java

@@ -109,13 +109,13 @@ public boolean isOrphanRemoval() {
     /**
      * @return The inverse side or null if the association is not bidirectional
      */
-    public Association getInverseSide() {
+    public Association<?> getInverseSide() {
         final PersistentProperty associatedProperty = this.associatedEntity.getPropertyByName(this.referencedPropertyName);
         if (associatedProperty == null) {
             return null;
         }
         if (associatedProperty instanceof Association) {
-            return (Association) associatedProperty;
+            return (Association<?>) associatedProperty;
         }
         throw new IllegalMappingException("The inverse side [" + this.associatedEntity.getName() + "." +
                 associatedProperty.getName() + "] of the association [" + getOwner().getName() + "." +

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/types/Basic.java

@@ -34,20 +34,19 @@
  * @author Graeme Rocher
  * @since 1.0
  */
-@SuppressWarnings("rawtypes")
 public abstract class Basic<T extends Property> extends ToMany<T> {
 
     private CustomTypeMarshaller customTypeMarshaller;
 
-    private Class componentType;
+    private Class<?> componentType;
 
     public Basic(PersistentEntity owner, MappingContext context,
             PropertyDescriptor descriptor) {
         super(owner, context, descriptor);
         initializeComponentType();
     }
 
-    public Basic(PersistentEntity owner, MappingContext context, String name, Class type) {
+    public Basic(PersistentEntity owner, MappingContext context, String name, Class<T> type) {
         super(owner, context, name, type);
         initializeComponentType();
     }
@@ -84,12 +83,12 @@ else if (type.isArray()) {
 
     }
 
-    public Class getComponentType() {
+    public Class<?> getComponentType() {
         return this.componentType;
     }
 
     @Override
-    public Association getInverseSide() {
+    public Association<T> getInverseSide() {
         return null; // basic collection types have no inverse side
     }
 

grace-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/types/Custom.java

@@ -47,7 +47,6 @@ protected Custom(PersistentEntity owner, MappingContext context, String name, Cl
     /**
      * @return The type converter for this custom type
      */
-    @SuppressWarnings("rawtypes")
     public CustomTypeMarshaller<Object, T, T> getCustomTypeMarshaller() {
         return (CustomTypeMarshaller<Object, T, T>) this.customTypeMarshaller;
     }