Cleaned up all warning messages reported by Eclipse.

BatooOrg · Jun 12, 2013 · ec280ab · ec280ab
1 parent e3b66a4
commit ec280ab
Show file tree

Hide file tree

Showing 31 changed files with 119 additions and 16 deletions.
diff --git a/batoo-common/src/main/java/org/batoo/common/BatooVersion.java b/batoo-common/src/main/java/org/batoo/common/BatooVersion.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012 - Batoo Software ve Consultancy Ltd.
+ * 
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+
+package org.batoo.common;
+
+/**
+ * Common serial version throughout Batoo.
+ *
+ * @since 2.0.1.2
+ */
+public final class BatooVersion {
+	public static final long SERIAL_VERSION_UID = 1L;
+}
diff --git a/batoo-common/src/main/java/org/batoo/common/collections/FastLinkedList.java b/batoo-common/src/main/java/org/batoo/common/collections/FastLinkedList.java
@@ -27,6 +27,8 @@
 import java.util.NoSuchElementException;
 import java.util.Queue;
 
+import org.batoo.common.BatooVersion;
+
 /**
  * Doubly-linked list implementation that avoids interfaces.
  * <p>
@@ -41,6 +43,7 @@
  * @author hceylan
  */
 public class FastLinkedList<E> extends AbstractSequentialList<E> implements List<E>, Deque<E>, Cloneable, Serializable {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	static class FastLinkedListNode<E> {
 		E item;

diff --git a/batoo-common/src/main/java/org/batoo/common/util/CollectionUtils.java b/batoo-common/src/main/java/org/batoo/common/util/CollectionUtils.java
@@ -32,6 +32,8 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.batoo.common.BatooVersion;
+
 /**
  * Miscellaneous collection utility methods. Mainly for internal use within the framework.
  * 
@@ -74,6 +76,7 @@ public void remove() throws UnsupportedOperationException {
 	 * Adapts a Map to the MultiValueMap contract.
 	 */
 	private static class MultiValueMapAdapter<K, V> implements MultiValueMap<K, V>, Serializable {
+		private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 		private final Map<K, List<V>> map;
 

diff --git a/batoo-jdbc/src/main/java/org/batoo/jpa/jdbc/OptimisticLockFailedException.java b/batoo-jdbc/src/main/java/org/batoo/jpa/jdbc/OptimisticLockFailedException.java
@@ -20,13 +20,16 @@
 
 import javax.persistence.PersistenceException;
 
+import org.batoo.common.BatooVersion;
+
 /**
  * The exception thrown when the optimistic lock fails.
  * 
  * @author hceylan
  * @since 2.0.1
  */
 public class OptimisticLockFailedException extends PersistenceException {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	/**
 	 * 

diff --git a/batoo-jpa/pom.xml b/batoo-jpa/pom.xml
@@ -88,6 +88,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.3.7</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedCollection.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedCollection.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 
 import org.apache.commons.lang.mutable.MutableBoolean;
+import org.batoo.common.BatooVersion;
 import org.batoo.common.util.BatooUtils;
 import org.batoo.jpa.core.impl.criteria.EntryImpl;
 import org.batoo.jpa.core.impl.instance.ManagedInstance;
@@ -52,6 +53,7 @@
  * @since 2.0.0
  */
 public abstract class ManagedCollection<E> implements Serializable {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	private transient boolean changed;
 	private final transient ManagedInstance<?> managedInstance;
@@ -265,7 +267,7 @@ public void mergeWith(EntityManagerImpl entityManager, Object instance, MutableB
 			&& (this.inverse.getAttribute() instanceof PluralAttributeImpl) ? //
 			(PluralAssociationMappingImpl<?, ?, ?>) this.inverse : null;
 
-		// TODO needs to be overriden by ManagedMap
+		// TODO needs to be overridden by ManagedMap
 		// add the new children
 		for (int i = 0; i < mergedChildren.size(); i++) {
 			final E child = mergedChildren.get(i);

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedList.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedList.java
@@ -30,6 +30,7 @@
 import javax.persistence.PersistenceException;
 
 import org.apache.commons.lang.ObjectUtils;
+import org.batoo.common.BatooVersion;
 import org.batoo.common.util.BatooUtils;
 import org.batoo.jpa.core.impl.criteria.EntryImpl;
 import org.batoo.jpa.core.impl.instance.ManagedInstance;
@@ -50,6 +51,7 @@
  * @since 2.0.0
  */
 public class ManagedList<X, E> extends ManagedCollection<E> implements List<E> {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	/**
 	 * 

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedMap.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedMap.java
@@ -29,6 +29,7 @@
 
 import javax.persistence.PersistenceException;
 
+import org.batoo.common.BatooVersion;
 import org.batoo.common.util.BatooUtils;
 import org.batoo.jpa.core.impl.criteria.EntryImpl;
 import org.batoo.jpa.core.impl.instance.ManagedInstance;
@@ -51,6 +52,7 @@
  * @since 2.0.0
  */
 public class ManagedMap<X, K, V> extends ManagedCollection<V> implements Map<K, V> {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	private HashMap<K, V> delegate;
 	private HashMap<K, V> snapshot;

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedSet.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/collections/ManagedSet.java
@@ -28,6 +28,7 @@
 
 import javax.persistence.PersistenceException;
 
+import org.batoo.common.BatooVersion;
 import org.batoo.common.util.BatooUtils;
 import org.batoo.jpa.core.impl.criteria.EntryImpl;
 import org.batoo.jpa.core.impl.instance.ManagedInstance;
@@ -46,6 +47,7 @@
  * @since 2.0.0
  */
 public class ManagedSet<X, E> extends ManagedCollection<E> implements Set<E> {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	private HashSet<E> delegate;
 	private transient HashSet<E> snapshot;

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/criteria/join/FetchParentImpl.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/criteria/join/FetchParentImpl.java
@@ -905,6 +905,7 @@ public EntryImpl<Object, X> handleElementFetch(ResultSet row, MapSelectType sele
 
 		if (this.keyColumnAlias != null) {
 			if (this.keyColumn == null) {
+				@SuppressWarnings("unchecked")
 				final ElementCollectionMappingImpl<? super X, ?, ?> _mapping = (ElementCollectionMappingImpl<? super X, ?, ?>) this.mapping;
 				if (_mapping.getCollectionTable() != null) {
 					this.keyColumn = _mapping.getCollectionTable().getKeyColumn();

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/manager/EntityManagerFactoryImpl.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/manager/EntityManagerFactoryImpl.java
@@ -46,6 +46,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.batoo.common.BatooException;
+import org.batoo.common.BatooVersion;
 import org.batoo.common.log.BLogger;
 import org.batoo.common.log.BLoggerFactory;
 import org.batoo.jpa.BJPASettings;
@@ -81,6 +82,7 @@
  * @since 2.0.0
  */
 public class EntityManagerFactoryImpl implements EntityManagerFactory, Serializable {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	private static final BLogger LOG = BLoggerFactory.getLogger(EntityManagerFactoryImpl.class);
 

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/manager/JtaEntityManagerFactoryImpl.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/manager/JtaEntityManagerFactoryImpl.java
@@ -30,6 +30,7 @@
 import javax.persistence.PersistenceException;
 import javax.transaction.TransactionManager;
 
+import org.batoo.common.BatooVersion;
 import org.batoo.common.log.BLogger;
 import org.batoo.common.log.BLoggerFactory;
 import org.batoo.jpa.parser.PersistenceParser;
@@ -43,6 +44,7 @@
  * @since 2.0.0
  */
 public class JtaEntityManagerFactoryImpl extends EntityManagerFactoryImpl {
+	private static final long serialVersionUID = BatooVersion.SERIAL_VERSION_UID;
 
 	private static final BLogger LOG = BLoggerFactory.getLogger(JtaEntityManagerFactoryImpl.class);
 

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/model/mapping/AbstractMapping.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/impl/model/mapping/AbstractMapping.java
@@ -66,10 +66,11 @@ public abstract class AbstractMapping<Z, X, Y> implements Mapping<Z, X, Y> {
 	 * 
 	 * @since 2.0.0
 	 */
+	@SuppressWarnings("unchecked")
 	public AbstractMapping(AbstractParentMapping<?, Z> parent, AttributeImpl<? super Z, X> attribute, Class<X> javaType, String name) {
 		super();
 
-		this.javaType = attribute instanceof Bindable ? ((Bindable) attribute).getBindableJavaType() : javaType;
+		this.javaType = attribute instanceof Bindable ? ((Bindable<X>) attribute).getBindableJavaType() : javaType;
 		this.parent = parent;
 		this.attribute = attribute;
 		this.name = name;

diff --git a/batoo-jpa/src/main/java/org/batoo/jpa/core/osgi/PersistenceActivator.java b/batoo-jpa/src/main/java/org/batoo/jpa/core/osgi/PersistenceActivator.java
@@ -32,9 +32,7 @@
  */
 @SuppressWarnings("rawtypes")
 public class PersistenceActivator implements BundleActivator {
-
-	private static BundleContext context = null;
-	private static ServiceRegistration serviceReg = null;
+	private ServiceRegistration serviceReg;
 
 	public PersistenceActivator() {
 		super();
@@ -46,14 +44,12 @@ public PersistenceActivator() {
 	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
-		PersistenceActivator.context = context;
-
 		final Hashtable<String, String> props = new Hashtable<String, String>();
 		props.put("javax.persistence.provider", org.batoo.jpa.core.BatooPersistenceProvider.class.getName());
 		props.put("javax.persistence.spi.PersistenceProvider", org.batoo.jpa.core.BatooPersistenceProvider.class.getName());
 		props.put("javax.persistence.PersistenceProvider", org.batoo.jpa.core.BatooPersistenceProvider.class.getName());
 
-		PersistenceActivator.serviceReg = context.registerService("javax.persistence.spi.PersistenceProvider",
+		serviceReg = context.registerService("javax.persistence.spi.PersistenceProvider",
 			new org.batoo.jpa.core.BatooPersistenceProvider(), props);
 	}
 
@@ -63,11 +59,9 @@ public void start(BundleContext context) throws Exception {
 	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
-		if (PersistenceActivator.serviceReg != null) {
-			PersistenceActivator.serviceReg.unregister();
-			PersistenceActivator.serviceReg = null;
+		if (null != serviceReg) {
+			serviceReg.unregister();
+			serviceReg = null;
 		}
-
-		PersistenceActivator.context = null;
 	}
 }
diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Address.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Address.java
@@ -34,6 +34,7 @@
  */
 @Entity
 public class Address implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE)

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Country.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Country.java
@@ -30,6 +30,7 @@
  */
 @Entity
 public class Country implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	@Id
 	private Integer id;

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/HomePhone.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/HomePhone.java
@@ -29,6 +29,7 @@
  */
 @Entity
 public class HomePhone extends Phone {
+	private static final long serialVersionUID = 1L;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	private Person person;

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Person.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Person.java
@@ -38,6 +38,7 @@
  */
 @Entity
 public class Person implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE)

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Phone.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/Phone.java
@@ -32,6 +32,7 @@
  */
 @MappedSuperclass
 public class Phone implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE)

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/WorkPhone.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/fetch/lazy/WorkPhone.java
@@ -27,6 +27,7 @@
  */
 @Entity
 public class WorkPhone extends Phone {
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/generic/Foo.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/generic/Foo.java
@@ -27,6 +27,7 @@
  */
 @Entity
 public class Foo extends AbstractPersistable<Long> {
+	private static final long serialVersionUID = 1L;
 
 	private String fooValue;
 

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/AbstractEntity.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/AbstractEntity.java
@@ -34,6 +34,8 @@
 @Entity
 @SuppressWarnings("javadoc")
 public abstract class AbstractEntity extends TopMappedSuperClass {
+	private static final long serialVersionUID = 1L;
+
 	@Basic
 	@Column(nullable = false)
 	private String myAbstractProperty;

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/CompositeEntity.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/CompositeEntity.java
@@ -38,6 +38,7 @@
 @Table
 @SuppressWarnings("javadoc")
 public class CompositeEntity extends TopMappedSuperClass {
+	private static final long serialVersionUID = 1L;
 
 	@Basic
 	@Column(nullable = false)

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/ConcreteEntity.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/ConcreteEntity.java
@@ -37,6 +37,7 @@
 @Table
 @SuppressWarnings("javadoc")
 public class ConcreteEntity extends AbstractEntity {
+	private static final long serialVersionUID = 1L;
 
 	@Basic
 	@Column(nullable = false)

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/EntityB.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/EntityB.java
@@ -40,6 +40,8 @@
 @Table
 @SuppressWarnings("javadoc")
 public class EntityB extends TopMappedSuperClass {
+	private static final long serialVersionUID = 1L;
+
 	@Basic
 	@Column(nullable = false)
 	private String code;

diff --git a/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/SerializationTest.java b/batoo-jpa/src/test/java/org/batoo/jpa/core/test/serialization/SerializationTest.java
@@ -118,8 +118,10 @@ public void testSerialization() throws IOException, ClassNotFoundException {
 		final ObjectInputStream ois = new ObjectInputStream(pis);
 
 		oos.writeObject(entity);
+		oos.close();
 
 		final CompositeEntity transportedEntity = (CompositeEntity) ois.readObject();
+		ois.close();
 
 		Assert.assertEquals(entity.getId(), transportedEntity.getId());
 		Assert.assertEquals(entity.getTimeStamp(), transportedEntity.getTimeStamp());

diff --git a/parser/pom.xml b/parser/pom.xml
@@ -60,7 +60,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>1.3.1</version>
+				<version>1.5</version>
 				<configuration>
 					<bindingFiles>spec.xjb</bindingFiles>
 					<schemaFiles>persistence_2_0.xsd</schemaFiles>

diff --git a/parser/src/main/java/org/batoo/jpa/parser/PersistenceUnitInfoImpl.java b/parser/src/main/java/org/batoo/jpa/parser/PersistenceUnitInfoImpl.java
@@ -123,7 +123,7 @@ private DataSource createDatasource(String jndiName) {
 	}
 
 	private boolean createExcludeUnlistedProperties(final PersistenceUnit pu) {
-		return pu.getExcludeUnlistedClasses() != null ? pu.getExcludeUnlistedClasses() : !this.managedClassNames.isEmpty();
+		return pu.isExcludeUnlistedClasses() != null ? pu.isExcludeUnlistedClasses() : !this.managedClassNames.isEmpty();
 	}
 
 	private List<URL> createJarFiles(PersistenceUnit pu) {

diff --git a/parser/src/main/java/org/batoo/jpa/parser/impl/acl/JarAnnotatedClassLocator.java b/parser/src/main/java/org/batoo/jpa/parser/impl/acl/JarAnnotatedClassLocator.java
@@ -86,8 +86,9 @@ private Set<Class<?>> findClasses(PersistenceUnitInfo persistenceUnitInfo, URL u
 					classes.add(clazz);
 				}
 			}
-
 		}
+
+		jarFile.close();
 
 		return classes;
 	}